Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95c967c1 authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

[media] gspca: Remove __devinit, __devinitconst and __devinitdata 



__devinit* must not be used in USB drivers.

Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0beb6714

drivers/media/video/gspca/benq.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x04a5, 0x3035)},

	{}

};

drivers/media/video/gspca/conex.c

+2 −2
Original line number Diff line number Diff line
@@ -1040,14 +1040,14 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

static const struct usb_device_id device_table[] __devinitconst = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x0572, 0x0041)},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);



/* -- device connect -- */

static int __devinit sd_probe(struct usb_interface *intf,

static int sd_probe(struct usb_interface *intf,

			const struct usb_device_id *id)

{

	return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),

drivers/media/video/gspca/cpia1.c

+1 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,7 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

static const __devinitdata struct usb_device_id device_table[] = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x0553, 0x0002)},

	{USB_DEVICE(0x0813, 0x0001)},

	{}

drivers/media/video/gspca/etoms.c

+2 −2
Original line number Diff line number Diff line
@@ -864,7 +864,7 @@ static const struct sd_desc sd_desc = { 
};



/* -- module initialisation -- */

static const struct usb_device_id device_table[] __devinitconst = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},

#if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE

	{USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
@@ -875,7 +875,7 @@ static const struct usb_device_id device_table[] __devinitconst = { 
MODULE_DEVICE_TABLE(usb, device_table);



/* -- device connect -- */

static int __devinit sd_probe(struct usb_interface *intf,

static int sd_probe(struct usb_interface *intf,

		    const struct usb_device_id *id)

{

	return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),

drivers/media/video/gspca/finepix.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) 
}



/* Table of supported USB devices */

static const __devinitdata struct usb_device_id device_table[] = {

static const struct usb_device_id device_table[] = {

	{USB_DEVICE(0x04cb, 0x0104)},

	{USB_DEVICE(0x04cb, 0x0109)},

	{USB_DEVICE(0x04cb, 0x010b)},