summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-05-30 08:45:48 +0200
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-03 16:44:24 +0200
commite867110a9a3241196613816d5bfd4688ebac15bb (patch)
tree162aca208af78b43cc071a2469753b3dafe856b2 /drivers/media
parentmedia: wl128x: Fix some error handling in fm_v4l2_init_video_device() (diff)
downloadlinux-e867110a9a3241196613816d5bfd4688ebac15bb.tar.xz
linux-e867110a9a3241196613816d5bfd4688ebac15bb.zip
media: dvb-usb/cxusb-analog.c: fix coccinelle warning, use ktime.h
This patch fixes a coccinelle warning and includes ktime.h instead of timekeeping.h. The first includes the latter, but the latter doesn't exist before 3.17, causing problems for our compat build. It's easier to just use ktime.h instead. coccinelle warnings: (new ones prefixed by >>) >> drivers/media/usb/dvb-usb/cxusb-analog.c:1498:41-42: WARNING: Use ARRAY_SIZE Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/dvb-usb/cxusb-analog.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/usb/dvb-usb/cxusb-analog.c b/drivers/media/usb/dvb-usb/cxusb-analog.c
index 9b42ca71c177..9b4f17ec63d3 100644
--- a/drivers/media/usb/dvb-usb/cxusb-analog.c
+++ b/drivers/media/usb/dvb-usb/cxusb-analog.c
@@ -25,7 +25,7 @@
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/timekeeping.h>
+#include <linux/ktime.h>
#include <linux/vmalloc.h>
#include <media/drv-intf/cx25840.h>
#include <media/tuner.h>
@@ -1622,8 +1622,7 @@ int cxusb_medion_analog_init(struct dvb_usb_device *dvbdev)
/* TODO: setup audio samples insertion */
ret = v4l2_subdev_call(cxdev->cx25840, core, s_io_pin_config,
- sizeof(cxusub_medion_pin_config) /
- sizeof(cxusub_medion_pin_config[0]),
+ ARRAY_SIZE(cxusub_medion_pin_config),
cxusub_medion_pin_config);
if (ret != 0)
dev_warn(&dvbdev->udev->dev,