Skip to content

L
linux
Commit 37b372e5 authored by Márton Németh's avatar Márton Németh Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (13621): gspca - some subdrivers: Make device_table[]s constant. 

Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 422eaac5
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
drivers/media/video/gspca/conex.c
View file @ 37b372e5
...@@ -1046,14 +1046,14 @@ static struct sd_desc sd_desc = { ...@@ -1046,14 +1046,14 @@ static struct sd_desc sd_desc = {
}; };
/* -- module initialisation -- */ /* -- module initialisation -- */
static __devinitdata struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] __devinitconst = {
{USB_DEVICE(0x0572, 0x0041)}, {USB_DEVICE(0x0572, 0x0041)},
{} {}
}; };
MODULE_DEVICE_TABLE(usb, device_table); MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */ /* -- device connect -- */
static int sd_probe(struct usb_interface *intf, static int __devinit sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
......
drivers/media/video/gspca/etoms.c
View file @ 37b372e5
...@@ -864,7 +864,7 @@ static struct sd_desc sd_desc = { ...@@ -864,7 +864,7 @@ static struct sd_desc sd_desc = {
}; };
/* -- module initialisation -- */ /* -- module initialisation -- */
static __devinitdata struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] __devinitconst = {
{USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106}, {USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106},
#if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE #if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE
{USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX}, {USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX},
...@@ -875,7 +875,7 @@ static __devinitdata struct usb_device_id device_table[] = { ...@@ -875,7 +875,7 @@ static __devinitdata struct usb_device_id device_table[] = {
MODULE_DEVICE_TABLE(usb, device_table); MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */ /* -- device connect -- */
static int sd_probe(struct usb_interface *intf, static int __devinit sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
......
drivers/media/video/gspca/pac7302.c
View file @ 37b372e5
...@@ -1229,7 +1229,7 @@ static struct sd_desc sd_desc = { ...@@ -1229,7 +1229,7 @@ static struct sd_desc sd_desc = {
}; };
/* -- module initialisation -- */ /* -- module initialisation -- */
static __devinitdata struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] __devinitconst = {
{USB_DEVICE(0x06f8, 0x3009)}, {USB_DEVICE(0x06f8, 0x3009)},
{USB_DEVICE(0x093a, 0x2620)}, {USB_DEVICE(0x093a, 0x2620)},
{USB_DEVICE(0x093a, 0x2621)}, {USB_DEVICE(0x093a, 0x2621)},
...@@ -1245,7 +1245,7 @@ static __devinitdata struct usb_device_id device_table[] = { ...@@ -1245,7 +1245,7 @@ static __devinitdata struct usb_device_id device_table[] = {
MODULE_DEVICE_TABLE(usb, device_table); MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */ /* -- device connect -- */
static int sd_probe(struct usb_interface *intf, static int __devinit sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
......
drivers/media/video/gspca/pac7311.c
View file @ 37b372e5
...@@ -863,7 +863,7 @@ static struct sd_desc sd_desc = { ...@@ -863,7 +863,7 @@ static struct sd_desc sd_desc = {
}; };
/* -- module initialisation -- */ /* -- module initialisation -- */
static __devinitdata struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] __devinitconst = {
{USB_DEVICE(0x093a, 0x2600)}, {USB_DEVICE(0x093a, 0x2600)},
{USB_DEVICE(0x093a, 0x2601)}, {USB_DEVICE(0x093a, 0x2601)},
{USB_DEVICE(0x093a, 0x2603)}, {USB_DEVICE(0x093a, 0x2603)},
...@@ -875,7 +875,7 @@ static __devinitdata struct usb_device_id device_table[] = { ...@@ -875,7 +875,7 @@ static __devinitdata struct usb_device_id device_table[] = {
MODULE_DEVICE_TABLE(usb, device_table); MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */ /* -- device connect -- */
static int sd_probe(struct usb_interface *intf, static int __devinit sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
......
drivers/media/video/gspca/sonixb.c
View file @ 37b372e5
...@@ -1226,7 +1226,7 @@ static const struct sd_desc sd_desc = { ...@@ -1226,7 +1226,7 @@ static const struct sd_desc sd_desc = {
.driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge .driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge
static __devinitdata struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] __devinitconst = {
{USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)}, /* TAS5110C1B */ {USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)}, /* TAS5110C1B */
{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)}, /* TAS5110C1B */ {USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)}, /* TAS5110C1B */
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
...@@ -1257,7 +1257,7 @@ static __devinitdata struct usb_device_id device_table[] = { ...@@ -1257,7 +1257,7 @@ static __devinitdata struct usb_device_id device_table[] = {
MODULE_DEVICE_TABLE(usb, device_table); MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */ /* -- device connect -- */
static int sd_probe(struct usb_interface *intf, static int __devinit sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
......
drivers/media/video/gspca/spca506.c
View file @ 37b372e5
...@@ -685,7 +685,7 @@ static struct sd_desc sd_desc = { ...@@ -685,7 +685,7 @@ static struct sd_desc sd_desc = {
}; };
/* -- module initialisation -- */ /* -- module initialisation -- */
static __devinitdata struct usb_device_id device_table[] = { static const struct usb_device_id device_table[] __devinitconst = {
{USB_DEVICE(0x06e1, 0xa190)}, {USB_DEVICE(0x06e1, 0xa190)},
/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505 /*fixme: may be IntelPCCameraPro BRIDGE_SPCA505
{USB_DEVICE(0x0733, 0x0430)}, */ {USB_DEVICE(0x0733, 0x0430)}, */
...@@ -696,7 +696,7 @@ static __devinitdata struct usb_device_id device_table[] = { ...@@ -696,7 +696,7 @@ static __devinitdata struct usb_device_id device_table[] = {
MODULE_DEVICE_TABLE(usb, device_table); MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */ /* -- device connect -- */
static int sd_probe(struct usb_interface *intf, static int __devinit sd_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd), return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7