aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/dib8000.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2015-04-28 09:28:45 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-28 09:30:33 -0300
commit21de82e374712f3ebfe102b3643e63d633dd350c (patch)
treefa52aa397c29e5a37768335f62b749a85bd06d6c /drivers/media/dvb-frontends/dib8000.h
parent[media] cx24123/mb86a20s/s921: fix compiler warnings (diff)
downloadlinux-dev-21de82e374712f3ebfe102b3643e63d633dd350c.tar.xz
linux-dev-21de82e374712f3ebfe102b3643e63d633dd350c.zip
[media] dib8000: fix compiler warning
In file included from include/uapi/linux/posix_types.h:4:0, from include/uapi/linux/types.h:13, from include/linux/types.h:5, from include/uapi/linux/sysinfo.h:4, from include/uapi/linux/kernel.h:4, from include/linux/cache.h:4, from include/linux/time.h:4, from include/linux/input.h:11, from drivers/media/usb/dvb-usb/dvb-usb.h:13, from drivers/media/usb/dvb-usb/dib0700.h:13, from drivers/media/usb/dvb-usb/dib0700_devices.c:9: drivers/media/dvb-frontends/dib8000.h: In function 'dib8000_attach': include/linux/stddef.h:8:14: warning: return makes integer from pointer without a cast [-Wint-conversion] #define NULL ((void *)0) ^ drivers/media/dvb-frontends/dib8000.h:72:9: note: in expansion of macro 'NULL' return NULL; ^ Reported-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends/dib8000.h')
-rw-r--r--drivers/media/dvb-frontends/dib8000.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
index 780c37bdcb72..2b8b4b1656a2 100644
--- a/drivers/media/dvb-frontends/dib8000.h
+++ b/drivers/media/dvb-frontends/dib8000.h
@@ -66,7 +66,7 @@ struct dib8000_ops {
#if IS_REACHABLE(CONFIG_DVB_DIB8000)
void *dib8000_attach(struct dib8000_ops *ops);
#else
-static inline int dib8000_attach(struct dib8000_ops *ops)
+static inline void *dib8000_attach(struct dib8000_ops *ops)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;