diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-25 11:06:04 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-25 11:06:04 +0300 |
| commit | 0fc4f78f44e6c6148cee32456f0d0023ec1c1fd8 (patch) | |
| tree | 71c906207227dd8753a0191db9304035ec3471a4 /drivers/media/tuners/tda18271-fe.c | |
| parent | 78010cd9736ec571796f4404524ed575b81238b9 (diff) | |
| parent | 5481e27f6fd06b7cb902072e81d6b083db8155eb (diff) | |
| download | linux-0fc4f78f44e6c6148cee32456f0d0023ec1c1fd8.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into topic/drm-misc
Backmerge latest drm-next to have a baseline for the
s/fence/dma_fence/ patch from Chris.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/media/tuners/tda18271-fe.c')
| -rw-r--r-- | drivers/media/tuners/tda18271-fe.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/tuners/tda18271-fe.c b/drivers/media/tuners/tda18271-fe.c index f8620741bb5f..2d50e8b1dce1 100644 --- a/drivers/media/tuners/tda18271-fe.c +++ b/drivers/media/tuners/tda18271-fe.c @@ -18,11 +18,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/delay.h> -#include <linux/videodev2.h> #include "tda18271-priv.h" #include "tda8290.h" +#include <linux/delay.h> +#include <linux/videodev2.h> + int tda18271_debug; module_param_named(debug, tda18271_debug, int, 0644); MODULE_PARM_DESC(debug, "set debug level " @@ -646,7 +647,7 @@ static int tda18271_calc_rf_filter_curve(struct dvb_frontend *fe) unsigned int i; int ret; - tda_info("tda18271: performing RF tracking filter calibration\n"); + tda_info("performing RF tracking filter calibration\n"); /* wait for die temperature stabilization */ msleep(200); @@ -692,12 +693,12 @@ static int tda18271c2_rf_cal_init(struct dvb_frontend *fe) if (tda_fail(ret)) goto fail; - tda_info("tda18271: RF tracking filter calibration complete\n"); + tda_info("RF tracking filter calibration complete\n"); priv->cal_initialized = true; goto end; fail: - tda_info("tda18271: RF tracking filter calibration failed!\n"); + tda_info("RF tracking filter calibration failed!\n"); end: return ret; } |