Skip to contentSkip to conversation

Fix warning in dvb-btxx driver

PATCH New Jean Delvare 1 participant 1 message Jan 15, 2006 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix warning in dvb-btxx driver

Hi Mauro, all,

Fix the following warning I am seeing in 2.6.15-git11, which seems to have been introduced by commit 348290a4ae143a692124330942b464ccdb0d0365:

CC [M] drivers/media/dvb/bt8xx/dvb-bt8xx.o
drivers/media/dvb/bt8xx/dvb-bt8xx.c:923: warning: initialization from incompatible pointer type

It would have also been possible to keep "void" as the return type and change the function itself instead, but given that the driver core's .remove method returns an int, my guess is that we want the same here.

---
 drivers/media/video/bttv.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/video/bttv.h +1 -1
@@ -366,7 +366,7 @@
 	struct device_driver   drv;
 	char                   wanted[BUS_ID_SIZE];
 	int                    (*probe)(struct bttv_sub_device *sub);
-	void                   (*remove)(struct bttv_sub_device *sub);
+	int                    (*remove)(struct bttv_sub_device *sub);
 	void                   (*gpio_irq)(struct bttv_sub_device *sub);
 };
 #define to_bttv_sub_drv(x) container_of((x), struct bttv_sub_driver, drv)
Signature · 1 line
Jean Delvare