git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0beb671
)
[media] gspca: Remove __devinit, __devinitconst and __devinitdata
author
Jean-François Moine
<moinejf@free.fr>
Thu, 13 Jan 2011 08:20:29 +0000
(
05:20
-0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Wed, 19 Jan 2011 13:45:35 +0000
(11:45 -0200)
__devinit* must not be used in USB drivers.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
39 files changed:
drivers/media/video/gspca/benq.c
patch
|
blob
|
history
drivers/media/video/gspca/conex.c
patch
|
blob
|
history
drivers/media/video/gspca/cpia1.c
patch
|
blob
|
history
drivers/media/video/gspca/etoms.c
patch
|
blob
|
history
drivers/media/video/gspca/finepix.c
patch
|
blob
|
history
drivers/media/video/gspca/gl860/gl860.c
patch
|
blob
|
history
drivers/media/video/gspca/jeilinj.c
patch
|
blob
|
history
drivers/media/video/gspca/konica.c
patch
|
blob
|
history
drivers/media/video/gspca/m5602/m5602_core.c
patch
|
blob
|
history
drivers/media/video/gspca/mars.c
patch
|
blob
|
history
drivers/media/video/gspca/mr97310a.c
patch
|
blob
|
history
drivers/media/video/gspca/ov519.c
patch
|
blob
|
history
drivers/media/video/gspca/ov534.c
patch
|
blob
|
history
drivers/media/video/gspca/ov534_9.c
patch
|
blob
|
history
drivers/media/video/gspca/pac207.c
patch
|
blob
|
history
drivers/media/video/gspca/pac7302.c
patch
|
blob
|
history
drivers/media/video/gspca/pac7311.c
patch
|
blob
|
history
drivers/media/video/gspca/sn9c2028.c
patch
|
blob
|
history
drivers/media/video/gspca/sn9c20x.c
patch
|
blob
|
history
drivers/media/video/gspca/sonixb.c
patch
|
blob
|
history
drivers/media/video/gspca/sonixj.c
patch
|
blob
|
history
drivers/media/video/gspca/spca1528.c
patch
|
blob
|
history
drivers/media/video/gspca/spca500.c
patch
|
blob
|
history
drivers/media/video/gspca/spca501.c
patch
|
blob
|
history
drivers/media/video/gspca/spca505.c
patch
|
blob
|
history
drivers/media/video/gspca/spca508.c
patch
|
blob
|
history
drivers/media/video/gspca/spca561.c
patch
|
blob
|
history
drivers/media/video/gspca/sq905.c
patch
|
blob
|
history
drivers/media/video/gspca/sq905c.c
patch
|
blob
|
history
drivers/media/video/gspca/sq930x.c
patch
|
blob
|
history
drivers/media/video/gspca/stk014.c
patch
|
blob
|
history
drivers/media/video/gspca/stv0680.c
patch
|
blob
|
history
drivers/media/video/gspca/stv06xx/stv06xx.c
patch
|
blob
|
history
drivers/media/video/gspca/sunplus.c
patch
|
blob
|
history
drivers/media/video/gspca/t613.c
patch
|
blob
|
history
drivers/media/video/gspca/tv8532.c
patch
|
blob
|
history
drivers/media/video/gspca/vc032x.c
patch
|
blob
|
history
drivers/media/video/gspca/xirlink_cit.c
patch
|
blob
|
history
drivers/media/video/gspca/zc3xx.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/gspca/benq.c
b/drivers/media/video/gspca/benq.c
index 62904393350104217490d8edbd002f6933fc0160..a09c4709d6139b9616e79804b39f0d1aa982ac1e 100644
(file)
--- a/
drivers/media/video/gspca/benq.c
+++ b/
drivers/media/video/gspca/benq.c
@@
-276,7
+276,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x04a5, 0x3035)},
{}
};
{USB_DEVICE(0x04a5, 0x3035)},
{}
};
diff --git
a/drivers/media/video/gspca/conex.c
b/drivers/media/video/gspca/conex.c
index 1eacb6c7926daa3737f1283d0bebd94bee8a83a8..8b398493f96bc65e63dd018bfd684109e16c9b6e 100644
(file)
--- a/
drivers/media/video/gspca/conex.c
+++ b/
drivers/media/video/gspca/conex.c
@@
-1040,14
+1040,14
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- 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 -- */
{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),
const struct usb_device_id *id)
{
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git
a/drivers/media/video/gspca/cpia1.c
b/drivers/media/video/gspca/cpia1.c
index c1ae05f4661f240d2fc65b504f3881d41eeeac63..4bf2cab98d64cd2a4c38a8f77de2ffb57f1decf5 100644
(file)
--- a/
drivers/media/video/gspca/cpia1.c
+++ b/
drivers/media/video/gspca/cpia1.c
@@
-2088,7
+2088,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- 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)},
{}
{USB_DEVICE(0x0553, 0x0002)},
{USB_DEVICE(0x0813, 0x0001)},
{}
diff --git
a/drivers/media/video/gspca/etoms.c
b/drivers/media/video/gspca/etoms.c
index a594b36d6199cb5cc45e4f0b229a67be5daeb78d..4b2c483fce6f9d48fce457ad764d3f4e0fdc5466 100644
(file)
--- a/
drivers/media/video/gspca/etoms.c
+++ b/
drivers/media/video/gspca/etoms.c
@@
-864,7
+864,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- 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},
{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 -- */
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),
const struct usb_device_id *id)
{
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git
a/drivers/media/video/gspca/finepix.c
b/drivers/media/video/gspca/finepix.c
index d78226455d1f40f0e6a586c95bb64d3fe4be181f..987b4b69d7ab2a71a06d7dc0c39b235646ef47a2 100644
(file)
--- a/
drivers/media/video/gspca/finepix.c
+++ b/
drivers/media/video/gspca/finepix.c
@@
-229,7
+229,7
@@
static void sd_stop0(struct gspca_dev *gspca_dev)
}
/* Table of supported USB devices */
}
/* 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)},
{USB_DEVICE(0x04cb, 0x0104)},
{USB_DEVICE(0x04cb, 0x0109)},
{USB_DEVICE(0x04cb, 0x010b)},
diff --git
a/drivers/media/video/gspca/gl860/gl860.c
b/drivers/media/video/gspca/gl860/gl860.c
index b05bec7321b5d94df6a93efff96db96f053405da..99083038cec3b7ec55b8ba861c5c8a1c1ed175bd 100644
(file)
--- a/
drivers/media/video/gspca/gl860/gl860.c
+++ b/
drivers/media/video/gspca/gl860/gl860.c
@@
-488,7
+488,7
@@
static void sd_callback(struct gspca_dev *gspca_dev)
/*=================== USB driver structure initialisation ==================*/
/*=================== USB driver structure initialisation ==================*/
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x05e3, 0x0503)},
{USB_DEVICE(0x05e3, 0xf191)},
{}
{USB_DEVICE(0x05e3, 0x0503)},
{USB_DEVICE(0x05e3, 0xf191)},
{}
diff --git
a/drivers/media/video/gspca/jeilinj.c
b/drivers/media/video/gspca/jeilinj.c
index a35e87bb0388bb0264dfad8335008452356e5982..06b777f5379ef7c7f92198cbe53306e6387be183 100644
(file)
--- a/
drivers/media/video/gspca/jeilinj.c
+++ b/
drivers/media/video/gspca/jeilinj.c
@@
-314,7
+314,7
@@
static int sd_start(struct gspca_dev *gspca_dev)
}
/* Table of supported USB devices */
}
/* Table of supported USB devices */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0979, 0x0280)},
{}
};
{USB_DEVICE(0x0979, 0x0280)},
{}
};
diff --git
a/drivers/media/video/gspca/konica.c
b/drivers/media/video/gspca/konica.c
index d2ce65dcbfdc16e48761f643415fee5f613e0147..5964691c0e95e66f8b6c56905181ba0281822b6f 100644
(file)
--- a/
drivers/media/video/gspca/konica.c
+++ b/
drivers/media/video/gspca/konica.c
@@
-607,7
+607,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x04c8, 0x0720)}, /* Intel YC 76 */
{}
};
{USB_DEVICE(0x04c8, 0x0720)}, /* Intel YC 76 */
{}
};
diff --git
a/drivers/media/video/gspca/m5602/m5602_core.c
b/drivers/media/video/gspca/m5602/m5602_core.c
index c872b93a3351c02f7186402820437fc46a4ac98d..a7722b1aef9b5963d1dba5cd511a6860393e7dbf 100644
(file)
--- a/
drivers/media/video/gspca/m5602/m5602_core.c
+++ b/
drivers/media/video/gspca/m5602/m5602_core.c
@@
-28,7
+28,7
@@
int force_sensor;
static int dump_bridge;
int dump_sensor;
static int dump_bridge;
int dump_sensor;
-static const
__devinitdata
struct usb_device_id m5602_table[] = {
+static const struct usb_device_id m5602_table[] = {
{USB_DEVICE(0x0402, 0x5602)},
{}
};
{USB_DEVICE(0x0402, 0x5602)},
{}
};
diff --git
a/drivers/media/video/gspca/mars.c
b/drivers/media/video/gspca/mars.c
index a81536e78698bbb41eda812e8689735198cdbc73..cb4d0bf0d784787c68a8ee3ff3954e5b06a79f41 100644
(file)
--- a/
drivers/media/video/gspca/mars.c
+++ b/
drivers/media/video/gspca/mars.c
@@
-490,7
+490,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x093a, 0x050f)},
{}
};
{USB_DEVICE(0x093a, 0x050f)},
{}
};
diff --git
a/drivers/media/video/gspca/mr97310a.c
b/drivers/media/video/gspca/mr97310a.c
index 7607a288b51cd326b89db0f2f5826f101ba84c23..3884c9d300c5ed766f34eed7060cb59161494c77 100644
(file)
--- a/
drivers/media/video/gspca/mr97310a.c
+++ b/
drivers/media/video/gspca/mr97310a.c
@@
-1229,7
+1229,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x08ca, 0x0110)}, /* Trust Spyc@m 100 */
{USB_DEVICE(0x08ca, 0x0111)}, /* Aiptek Pencam VGA+ */
{USB_DEVICE(0x093a, 0x010f)}, /* All other known MR97310A VGA cams */
{USB_DEVICE(0x08ca, 0x0110)}, /* Trust Spyc@m 100 */
{USB_DEVICE(0x08ca, 0x0111)}, /* Aiptek Pencam VGA+ */
{USB_DEVICE(0x093a, 0x010f)}, /* All other known MR97310A VGA cams */
diff --git
a/drivers/media/video/gspca/ov519.c
b/drivers/media/video/gspca/ov519.c
index e1c3b9328aceb9c0ae1de6df55ad608e102f47ee..e30791f05690b39b0f886d9da2929260883de698 100644
(file)
--- a/
drivers/media/video/gspca/ov519.c
+++ b/
drivers/media/video/gspca/ov519.c
@@
-4747,7
+4747,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x4003), .driver_info = BRIDGE_W9968CF },
{USB_DEVICE(0x041e, 0x4052), .driver_info = BRIDGE_OV519 },
{USB_DEVICE(0x041e, 0x405f), .driver_info = BRIDGE_OV519 },
{USB_DEVICE(0x041e, 0x4003), .driver_info = BRIDGE_W9968CF },
{USB_DEVICE(0x041e, 0x4052), .driver_info = BRIDGE_OV519 },
{USB_DEVICE(0x041e, 0x405f), .driver_info = BRIDGE_OV519 },
diff --git
a/drivers/media/video/gspca/ov534.c
b/drivers/media/video/gspca/ov534.c
index 0edf93973b1c7eb2eb27e322e9799d95db90121e..ba8e56c3fc832677987192a0c9acb21f4273bf23 100644
(file)
--- a/
drivers/media/video/gspca/ov534.c
+++ b/
drivers/media/video/gspca/ov534.c
@@
-1289,7
+1289,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x1415, 0x2000)},
{}
};
{USB_DEVICE(0x1415, 0x2000)},
{}
};
diff --git
a/drivers/media/video/gspca/ov534_9.c
b/drivers/media/video/gspca/ov534_9.c
index c5244b4b47778648275daf975f7cc2b3cbdbdabf..aaf5428c57f57ac4fc3e37223074ec456973ebee 100644
(file)
--- a/
drivers/media/video/gspca/ov534_9.c
+++ b/
drivers/media/video/gspca/ov534_9.c
@@
-1429,7
+1429,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x06f8, 0x3003)},
{}
};
{USB_DEVICE(0x06f8, 0x3003)},
{}
};
diff --git
a/drivers/media/video/gspca/pac207.c
b/drivers/media/video/gspca/pac207.c
index 96f9986305b4f783d5919705470119de07b6cc09..81739a2f205e8e020ac789c984d60a143603e3ce 100644
(file)
--- a/
drivers/media/video/gspca/pac207.c
+++ b/
drivers/media/video/gspca/pac207.c
@@
-530,7
+530,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x4028)},
{USB_DEVICE(0x093a, 0x2460)},
{USB_DEVICE(0x093a, 0x2461)},
{USB_DEVICE(0x041e, 0x4028)},
{USB_DEVICE(0x093a, 0x2460)},
{USB_DEVICE(0x093a, 0x2461)},
diff --git
a/drivers/media/video/gspca/pac7302.c
b/drivers/media/video/gspca/pac7302.c
index 2700975abce5e277103830ef419485054d05976a..5615d7bd830455e8e1e269c94311601e6b4b8c16 100644
(file)
--- a/
drivers/media/video/gspca/pac7302.c
+++ b/
drivers/media/video/gspca/pac7302.c
@@
-1184,7
+1184,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const struct usb_device_id device_table[]
__devinitconst
= {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x06f8, 0x3009)},
{USB_DEVICE(0x093a, 0x2620)},
{USB_DEVICE(0x093a, 0x2621)},
{USB_DEVICE(0x06f8, 0x3009)},
{USB_DEVICE(0x093a, 0x2620)},
{USB_DEVICE(0x093a, 0x2621)},
@@
-1201,7
+1201,7
@@
static const struct usb_device_id device_table[] __devinitconst = {
MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */
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),
const struct usb_device_id *id)
{
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git
a/drivers/media/video/gspca/pac7311.c
b/drivers/media/video/gspca/pac7311.c
index 6820f5d58b19d1933478a98bb0ff0b4f629d8ed9..f8801b50e64f2f20b5c5030bb76faaeafef073c8 100644
(file)
--- a/
drivers/media/video/gspca/pac7311.c
+++ b/
drivers/media/video/gspca/pac7311.c
@@
-837,7
+837,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const struct usb_device_id device_table[]
__devinitconst
= {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x093a, 0x2600)},
{USB_DEVICE(0x093a, 0x2601)},
{USB_DEVICE(0x093a, 0x2603)},
{USB_DEVICE(0x093a, 0x2600)},
{USB_DEVICE(0x093a, 0x2601)},
{USB_DEVICE(0x093a, 0x2603)},
@@
-849,7
+849,7
@@
static const struct usb_device_id device_table[] __devinitconst = {
MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */
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),
const struct usb_device_id *id)
{
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git
a/drivers/media/video/gspca/sn9c2028.c
b/drivers/media/video/gspca/sn9c2028.c
index 40a06680502d15ee48254eede1721932449aab27..4271f86dfe015eab27bc91bec6d4149b25e175bd 100644
(file)
--- a/
drivers/media/video/gspca/sn9c2028.c
+++ b/
drivers/media/video/gspca/sn9c2028.c
@@
-703,7
+703,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0458, 0x7005)}, /* Genius Smart 300, version 2 */
/* The Genius Smart is untested. I can't find an owner ! */
/* {USB_DEVICE(0x0c45, 0x8000)}, DC31VC, Don't know this camera */
{USB_DEVICE(0x0458, 0x7005)}, /* Genius Smart 300, version 2 */
/* The Genius Smart is untested. I can't find an owner ! */
/* {USB_DEVICE(0x0c45, 0x8000)}, DC31VC, Don't know this camera */
diff --git
a/drivers/media/video/gspca/sn9c20x.c
b/drivers/media/video/gspca/sn9c20x.c
index cb08d00d0a31a03db86e2fd6822485d7f424ed96..fcf29897b71308f9148ddf40bdb515497e09f5c6 100644
(file)
--- a/
drivers/media/video/gspca/sn9c20x.c
+++ b/
drivers/media/video/gspca/sn9c20x.c
@@
-2470,7
+2470,7
@@
static const struct sd_desc sd_desc = {
| (SENSOR_ ## sensor << 8) \
| (i2c_addr)
| (SENSOR_ ## sensor << 8) \
| (i2c_addr)
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0c45, 0x6240), SN9C20X(MT9M001, 0x5d, 0)},
{USB_DEVICE(0x0c45, 0x6242), SN9C20X(MT9M111, 0x5d, 0)},
{USB_DEVICE(0x0c45, 0x6248), SN9C20X(OV9655, 0x30, 0)},
{USB_DEVICE(0x0c45, 0x6240), SN9C20X(MT9M001, 0x5d, 0)},
{USB_DEVICE(0x0c45, 0x6242), SN9C20X(MT9M111, 0x5d, 0)},
{USB_DEVICE(0x0c45, 0x6248), SN9C20X(OV9655, 0x30, 0)},
diff --git
a/drivers/media/video/gspca/sonixb.c
b/drivers/media/video/gspca/sonixb.c
index e45d1cfb44616ab56e782fce4be9c8668ebcc4e9..c6cd68d66b533a9b08e87f114e5cba69d48bfe24 100644
(file)
--- a/
drivers/media/video/gspca/sonixb.c
+++ b/
drivers/media/video/gspca/sonixb.c
@@
-1565,7
+1565,7
@@
static const struct sd_desc sd_desc = {
.driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge
.driver_info = (SENSOR_ ## sensor << 8) | BRIDGE_ ## bridge
-static const struct usb_device_id device_table[]
__devinitconst
= {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0c45, 0x6001), SB(TAS5110C, 102)}, /* TAS5110C1B */
{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110C, 101)}, /* TAS5110C1B */
{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110D, 101)}, /* TAS5110D */
{USB_DEVICE(0x0c45, 0x6001), SB(TAS5110C, 102)}, /* TAS5110C1B */
{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110C, 101)}, /* TAS5110C1B */
{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110D, 101)}, /* TAS5110D */
@@
-1599,7
+1599,7
@@
static const struct usb_device_id device_table[] __devinitconst = {
MODULE_DEVICE_TABLE(usb, device_table);
/* -- device connect -- */
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),
const struct usb_device_id *id)
{
return gspca_dev_probe(intf, id, &sd_desc, sizeof(struct sd),
diff --git
a/drivers/media/video/gspca/sonixj.c
b/drivers/media/video/gspca/sonixj.c
index db35391d00e60d58282381d7cb9a1ce9e4edfd52..3e41653f11c1caf7ce757c1359114b8e0a81edbf 100644
(file)
--- a/
drivers/media/video/gspca/sonixj.c
+++ b/
drivers/media/video/gspca/sonixj.c
@@
-2909,7
+2909,7
@@
static const struct sd_desc sd_desc = {
.driver_info = (BRIDGE_ ## bridge << 16) \
| (SENSOR_ ## sensor << 8) \
| (flags)
.driver_info = (BRIDGE_ ## bridge << 16) \
| (SENSOR_ ## sensor << 8) \
| (flags)
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
{USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},
{USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, PDN_INV)},
{USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},
{USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},
{USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, PDN_INV)},
diff --git
a/drivers/media/video/gspca/spca1528.c
b/drivers/media/video/gspca/spca1528.c
index e643386644107a9dabcf1c63a393826e0d6fb5dd..76c006b2bc83035edbadd8da3d907b2943069ed1 100644
(file)
--- a/
drivers/media/video/gspca/spca1528.c
+++ b/
drivers/media/video/gspca/spca1528.c
@@
-555,7
+555,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x04fc, 0x1528)},
{}
};
{USB_DEVICE(0x04fc, 0x1528)},
{}
};
diff --git
a/drivers/media/video/gspca/spca500.c
b/drivers/media/video/gspca/spca500.c
index 8e202b9039f18895358cb12d1762fa284f481bec..45552c3ff8d9ce701c36e3c75070260673911cfe 100644
(file)
--- a/
drivers/media/video/gspca/spca500.c
+++ b/
drivers/media/video/gspca/spca500.c
@@
-1051,7
+1051,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x040a, 0x0300), .driver_info = KodakEZ200},
{USB_DEVICE(0x041e, 0x400a), .driver_info = CreativePCCam300},
{USB_DEVICE(0x046d, 0x0890), .driver_info = LogitechTraveler},
{USB_DEVICE(0x040a, 0x0300), .driver_info = KodakEZ200},
{USB_DEVICE(0x041e, 0x400a), .driver_info = CreativePCCam300},
{USB_DEVICE(0x046d, 0x0890), .driver_info = LogitechTraveler},
diff --git
a/drivers/media/video/gspca/spca501.c
b/drivers/media/video/gspca/spca501.c
index 642839a11e8d061aeb5c7c7ab5d590dd6e961814..f7ef282cc600ccb75a39fa025b06774e6dcd5f26 100644
(file)
--- a/
drivers/media/video/gspca/spca501.c
+++ b/
drivers/media/video/gspca/spca501.c
@@
-2155,7
+2155,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x040a, 0x0002), .driver_info = KodakDVC325},
{USB_DEVICE(0x0497, 0xc001), .driver_info = SmileIntlCamera},
{USB_DEVICE(0x0506, 0x00df), .driver_info = ThreeComHomeConnectLite},
{USB_DEVICE(0x040a, 0x0002), .driver_info = KodakDVC325},
{USB_DEVICE(0x0497, 0xc001), .driver_info = SmileIntlCamera},
{USB_DEVICE(0x0506, 0x00df), .driver_info = ThreeComHomeConnectLite},
diff --git
a/drivers/media/video/gspca/spca505.c
b/drivers/media/video/gspca/spca505.c
index bc9dd9034ab499c9dbafeeb0a117f2d341722097..e5bf865147d7a5ec4ffb0f43e2acff3bb1909816 100644
(file)
--- a/
drivers/media/video/gspca/spca505.c
+++ b/
drivers/media/video/gspca/spca505.c
@@
-786,7
+786,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x401d), .driver_info = Nxultra},
{USB_DEVICE(0x0733, 0x0430), .driver_info = IntelPCCameraPro},
/*fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */
{USB_DEVICE(0x041e, 0x401d), .driver_info = Nxultra},
{USB_DEVICE(0x0733, 0x0430), .driver_info = IntelPCCameraPro},
/*fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */
diff --git
a/drivers/media/video/gspca/spca508.c
b/drivers/media/video/gspca/spca508.c
index 7307638ac91d65e221f3f6f6981d874e7e39b141..348319371523849da40357078c7f812a22689c9b 100644
(file)
--- a/
drivers/media/video/gspca/spca508.c
+++ b/
drivers/media/video/gspca/spca508.c
@@
-1509,7
+1509,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0130, 0x0130), .driver_info = HamaUSBSightcam},
{USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},
{USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},
{USB_DEVICE(0x0130, 0x0130), .driver_info = HamaUSBSightcam},
{USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},
{USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},
diff --git
a/drivers/media/video/gspca/spca561.c
b/drivers/media/video/gspca/spca561.c
index 3a162c6d54664e807ea368df14cf8015ed0c9b7b..e836e778dfb6ae08f3890b2f6d69759926fddf83 100644
(file)
--- a/
drivers/media/video/gspca/spca561.c
+++ b/
drivers/media/video/gspca/spca561.c
@@
-1061,7
+1061,7
@@
static const struct sd_desc *sd_desc[2] = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x401a), .driver_info = Rev072A},
{USB_DEVICE(0x041e, 0x403b), .driver_info = Rev012A},
{USB_DEVICE(0x0458, 0x7004), .driver_info = Rev072A},
{USB_DEVICE(0x041e, 0x401a), .driver_info = Rev072A},
{USB_DEVICE(0x041e, 0x403b), .driver_info = Rev012A},
{USB_DEVICE(0x0458, 0x7004), .driver_info = Rev072A},
diff --git
a/drivers/media/video/gspca/sq905.c
b/drivers/media/video/gspca/sq905.c
index 4040677457755e1a7908dca3af2701f07ef946f0..2e9c06175192cac3a2d5940ede21cbe57c15f2b5 100644
(file)
--- a/
drivers/media/video/gspca/sq905.c
+++ b/
drivers/media/video/gspca/sq905.c
@@
-396,7
+396,7
@@
static int sd_start(struct gspca_dev *gspca_dev)
}
/* Table of supported USB devices */
}
/* Table of supported USB devices */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x2770, 0x9120)},
{}
};
{USB_DEVICE(0x2770, 0x9120)},
{}
};
diff --git
a/drivers/media/video/gspca/sq905c.c
b/drivers/media/video/gspca/sq905c.c
index 8ba1995438568c2eaef60174081b6bd4e4dd59ff..457563b7a71bd98e246225eb2d4eb8026c1ebfde 100644
(file)
--- a/
drivers/media/video/gspca/sq905c.c
+++ b/
drivers/media/video/gspca/sq905c.c
@@
-298,7
+298,7
@@
static int sd_start(struct gspca_dev *gspca_dev)
}
/* Table of supported USB devices */
}
/* Table of supported USB devices */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x2770, 0x905c)},
{USB_DEVICE(0x2770, 0x9050)},
{USB_DEVICE(0x2770, 0x9051)},
{USB_DEVICE(0x2770, 0x905c)},
{USB_DEVICE(0x2770, 0x9050)},
{USB_DEVICE(0x2770, 0x9051)},
diff --git
a/drivers/media/video/gspca/sq930x.c
b/drivers/media/video/gspca/sq930x.c
index a4a98811b9e3f982415e298e5cd7b35040e153b1..8215d5dcd4560fa8383215971709b1e92dc36b31 100644
(file)
--- a/
drivers/media/video/gspca/sq930x.c
+++ b/
drivers/media/video/gspca/sq930x.c
@@
-1163,7
+1163,7
@@
static const struct sd_desc sd_desc = {
#define ST(sensor, type) \
.driver_info = (SENSOR_ ## sensor << 8) \
| (type)
#define ST(sensor, type) \
.driver_info = (SENSOR_ ## sensor << 8) \
| (type)
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x4038), ST(MI0360, 0)},
{USB_DEVICE(0x041e, 0x403c), ST(LZ24BP, 0)},
{USB_DEVICE(0x041e, 0x403d), ST(LZ24BP, 0)},
{USB_DEVICE(0x041e, 0x4038), ST(MI0360, 0)},
{USB_DEVICE(0x041e, 0x403c), ST(LZ24BP, 0)},
{USB_DEVICE(0x041e, 0x403d), ST(LZ24BP, 0)},
diff --git
a/drivers/media/video/gspca/stk014.c
b/drivers/media/video/gspca/stk014.c
index 11a192b95ed47394eb667f9941e8d3e08f51ab70..87be52b5e1e3666528226966d5d7456d369faddb 100644
(file)
--- a/
drivers/media/video/gspca/stk014.c
+++ b/
drivers/media/video/gspca/stk014.c
@@
-495,7
+495,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x05e1, 0x0893)},
{}
};
{USB_DEVICE(0x05e1, 0x0893)},
{}
};
diff --git
a/drivers/media/video/gspca/stv0680.c
b/drivers/media/video/gspca/stv0680.c
index b199ad4666bd4517cb8a56baa0ab499a0a8927d4..e2ef41cf72d74bdaca8425d34048a3a159895cb6 100644
(file)
--- a/
drivers/media/video/gspca/stv0680.c
+++ b/
drivers/media/video/gspca/stv0680.c
@@
-327,7
+327,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0553, 0x0202)},
{USB_DEVICE(0x041e, 0x4007)},
{}
{USB_DEVICE(0x0553, 0x0202)},
{USB_DEVICE(0x041e, 0x4007)},
{}
diff --git
a/drivers/media/video/gspca/stv06xx/stv06xx.c
b/drivers/media/video/gspca/stv06xx/stv06xx.c
index 28ea4175b80e55f4850ef1eb571ea347a39d685c..7e06614292936b15576fbf3f669d62369fd1b025 100644
(file)
--- a/
drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/
drivers/media/video/gspca/stv06xx/stv06xx.c
@@
-564,7
+564,7
@@
static int stv06xx_config(struct gspca_dev *gspca_dev,
/* -- module initialisation -- */
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
/* QuickCam Express */
{USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 },
/* LEGO cam / QuickCam Web */
/* QuickCam Express */
{USB_DEVICE(0x046d, 0x0840), .driver_info = BRIDGE_STV600 },
/* LEGO cam / QuickCam Web */
diff --git
a/drivers/media/video/gspca/sunplus.c
b/drivers/media/video/gspca/sunplus.c
index a9cbcd6011d9c19e7e2ce97942a54a77287feefa..543542af272048ef0e5d6bfa07887f4eb6b44774 100644
(file)
--- a/
drivers/media/video/gspca/sunplus.c
+++ b/
drivers/media/video/gspca/sunplus.c
@@
-1162,7
+1162,7
@@
static const struct sd_desc sd_desc = {
#define BS(bridge, subtype) \
.driver_info = (BRIDGE_ ## bridge << 8) \
| (subtype)
#define BS(bridge, subtype) \
.driver_info = (BRIDGE_ ## bridge << 8) \
| (subtype)
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x400b), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x4012), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x4013), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x400b), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x4012), BS(SPCA504C, 0)},
{USB_DEVICE(0x041e, 0x4013), BS(SPCA504C, 0)},
diff --git
a/drivers/media/video/gspca/t613.c
b/drivers/media/video/gspca/t613.c
index 8f0c33116e0d1e65eaa7d3d91f76251ea2e56678..a3eccd81576625119350e6177cb834d72c7ba652 100644
(file)
--- a/
drivers/media/video/gspca/t613.c
+++ b/
drivers/media/video/gspca/t613.c
@@
-1416,7
+1416,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x17a1, 0x0128)},
{}
};
{USB_DEVICE(0x17a1, 0x0128)},
{}
};
diff --git
a/drivers/media/video/gspca/tv8532.c
b/drivers/media/video/gspca/tv8532.c
index 38c22f0a4263f02a986d586d54a68391c2f84457..933ef2ca658c377ad5ae0312512f6882bac1490d 100644
(file)
--- a/
drivers/media/video/gspca/tv8532.c
+++ b/
drivers/media/video/gspca/tv8532.c
@@
-388,7
+388,7
@@
static const struct sd_desc sd_desc = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x046d, 0x0920)},
{USB_DEVICE(0x046d, 0x0921)},
{USB_DEVICE(0x0545, 0x808b)},
{USB_DEVICE(0x046d, 0x0920)},
{USB_DEVICE(0x046d, 0x0921)},
{USB_DEVICE(0x0545, 0x808b)},
diff --git
a/drivers/media/video/gspca/vc032x.c
b/drivers/media/video/gspca/vc032x.c
index 9b2ae1b6cc75c736f9607b63c601af29ec576dea..6caed734a06ab0559892a869f330f0d0840f8865 100644
(file)
--- a/
drivers/media/video/gspca/vc032x.c
+++ b/
drivers/media/video/gspca/vc032x.c
@@
-4192,7
+4192,7
@@
static const struct sd_desc sd_desc = {
#define BF(bridge, flags) \
.driver_info = (BRIDGE_ ## bridge << 8) \
| (flags)
#define BF(bridge, flags) \
.driver_info = (BRIDGE_ ## bridge << 8) \
| (flags)
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x405b), BF(VC0323, FL_VFLIP)},
{USB_DEVICE(0x046d, 0x0892), BF(VC0321, 0)},
{USB_DEVICE(0x046d, 0x0896), BF(VC0321, 0)},
{USB_DEVICE(0x041e, 0x405b), BF(VC0323, FL_VFLIP)},
{USB_DEVICE(0x046d, 0x0892), BF(VC0321, 0)},
{USB_DEVICE(0x046d, 0x0896), BF(VC0321, 0)},
diff --git
a/drivers/media/video/gspca/xirlink_cit.c
b/drivers/media/video/gspca/xirlink_cit.c
index 5b5039a02031f87ebd1b6e35193e79fa9ae603bc..c089a0f6f1d034924553357e6645584bb82504ea 100644
(file)
--- a/
drivers/media/video/gspca/xirlink_cit.c
+++ b/
drivers/media/video/gspca/xirlink_cit.c
@@
-3270,7
+3270,7
@@
static const struct sd_desc sd_desc_isoc_nego = {
};
/* -- module initialisation -- */
};
/* -- module initialisation -- */
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{ USB_DEVICE_VER(0x0545, 0x8080, 0x0001, 0x0001), .driver_info = CIT_MODEL0 },
{ USB_DEVICE_VER(0x0545, 0x8080, 0x0002, 0x0002), .driver_info = CIT_MODEL1 },
{ USB_DEVICE_VER(0x0545, 0x8080, 0x030a, 0x030a), .driver_info = CIT_MODEL2 },
{ USB_DEVICE_VER(0x0545, 0x8080, 0x0001, 0x0001), .driver_info = CIT_MODEL0 },
{ USB_DEVICE_VER(0x0545, 0x8080, 0x0002, 0x0002), .driver_info = CIT_MODEL1 },
{ USB_DEVICE_VER(0x0545, 0x8080, 0x030a, 0x030a), .driver_info = CIT_MODEL2 },
diff --git
a/drivers/media/video/gspca/zc3xx.c
b/drivers/media/video/gspca/zc3xx.c
index 14b85d48316393242e8b3c2f91f8d3dc96faf0a6..865216e9362c55c956af81b737855e58ec1fc318 100644
(file)
--- a/
drivers/media/video/gspca/zc3xx.c
+++ b/
drivers/media/video/gspca/zc3xx.c
@@
-6909,7
+6909,7
@@
static const struct sd_desc sd_desc = {
#endif
};
#endif
};
-static const
__devinitdata
struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x041e, 0x041e)},
{USB_DEVICE(0x041e, 0x4017)},
{USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106},
{USB_DEVICE(0x041e, 0x041e)},
{USB_DEVICE(0x041e, 0x4017)},
{USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106},