[media] gspca: Remove __devinit, __devinitconst and __devinitdata
__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>
This commit is contained in:
Родитель
0beb6714e7
Коммит
95c967c167
|
@ -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)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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)},
|
||||
{}
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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)},
|
||||
|
|
|
@ -488,7 +488,7 @@ static void sd_callback(struct gspca_dev *gspca_dev)
|
|||
|
||||
/*=================== 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)},
|
||||
{}
|
||||
|
|
|
@ -314,7 +314,7 @@ static int sd_start(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(0x0979, 0x0280)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -607,7 +607,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(0x04c8, 0x0720)}, /* Intel YC 76 */
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -28,7 +28,7 @@ int force_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)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -490,7 +490,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(0x093a, 0x050f)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -1229,7 +1229,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(0x08ca, 0x0110)}, /* Trust Spyc@m 100 */
|
||||
{USB_DEVICE(0x08ca, 0x0111)}, /* Aiptek Pencam VGA+ */
|
||||
{USB_DEVICE(0x093a, 0x010f)}, /* All other known MR97310A VGA cams */
|
||||
|
|
|
@ -4747,7 +4747,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(0x041e, 0x4003), .driver_info = BRIDGE_W9968CF },
|
||||
{USB_DEVICE(0x041e, 0x4052), .driver_info = BRIDGE_OV519 },
|
||||
{USB_DEVICE(0x041e, 0x405f), .driver_info = BRIDGE_OV519 },
|
||||
|
|
|
@ -1289,7 +1289,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(0x1415, 0x2000)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -1429,7 +1429,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(0x06f8, 0x3003)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -530,7 +530,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(0x041e, 0x4028)},
|
||||
{USB_DEVICE(0x093a, 0x2460)},
|
||||
{USB_DEVICE(0x093a, 0x2461)},
|
||||
|
|
|
@ -1184,7 +1184,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(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 -- */
|
||||
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),
|
||||
|
|
|
@ -837,7 +837,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(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 -- */
|
||||
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),
|
||||
|
|
|
@ -703,7 +703,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(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 */
|
||||
|
|
|
@ -2470,7 +2470,7 @@ static const struct sd_desc sd_desc = {
|
|||
| (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)},
|
||||
|
|
|
@ -1565,7 +1565,7 @@ static const struct sd_desc sd_desc = {
|
|||
.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 */
|
||||
|
@ -1599,7 +1599,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),
|
||||
|
|
|
@ -2909,7 +2909,7 @@ static const struct sd_desc sd_desc = {
|
|||
.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)},
|
||||
|
|
|
@ -555,7 +555,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(0x04fc, 0x1528)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -1051,7 +1051,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(0x040a, 0x0300), .driver_info = KodakEZ200},
|
||||
{USB_DEVICE(0x041e, 0x400a), .driver_info = CreativePCCam300},
|
||||
{USB_DEVICE(0x046d, 0x0890), .driver_info = LogitechTraveler},
|
||||
|
|
|
@ -2155,7 +2155,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(0x040a, 0x0002), .driver_info = KodakDVC325},
|
||||
{USB_DEVICE(0x0497, 0xc001), .driver_info = SmileIntlCamera},
|
||||
{USB_DEVICE(0x0506, 0x00df), .driver_info = ThreeComHomeConnectLite},
|
||||
|
|
|
@ -786,7 +786,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(0x041e, 0x401d), .driver_info = Nxultra},
|
||||
{USB_DEVICE(0x0733, 0x0430), .driver_info = IntelPCCameraPro},
|
||||
/*fixme: may be UsbGrabberPV321 BRIDGE_SPCA506 SENSOR_SAA7113 */
|
||||
|
|
|
@ -1509,7 +1509,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(0x0130, 0x0130), .driver_info = HamaUSBSightcam},
|
||||
{USB_DEVICE(0x041e, 0x4018), .driver_info = CreativeVista},
|
||||
{USB_DEVICE(0x0733, 0x0110), .driver_info = ViewQuestVQ110},
|
||||
|
|
|
@ -1061,7 +1061,7 @@ static const struct sd_desc *sd_desc[2] = {
|
|||
};
|
||||
|
||||
/* -- 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},
|
||||
|
|
|
@ -396,7 +396,7 @@ static int sd_start(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(0x2770, 0x9120)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -298,7 +298,7 @@ static int sd_start(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(0x2770, 0x905c)},
|
||||
{USB_DEVICE(0x2770, 0x9050)},
|
||||
{USB_DEVICE(0x2770, 0x9051)},
|
||||
|
|
|
@ -1163,7 +1163,7 @@ static const struct sd_desc sd_desc = {
|
|||
#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)},
|
||||
|
|
|
@ -495,7 +495,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(0x05e1, 0x0893)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -327,7 +327,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, 0x0202)},
|
||||
{USB_DEVICE(0x041e, 0x4007)},
|
||||
{}
|
||||
|
|
|
@ -564,7 +564,7 @@ static int stv06xx_config(struct gspca_dev *gspca_dev,
|
|||
|
||||
|
||||
/* -- 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 */
|
||||
|
|
|
@ -1162,7 +1162,7 @@ static const struct sd_desc sd_desc = {
|
|||
#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)},
|
||||
|
|
|
@ -1416,7 +1416,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(0x17a1, 0x0128)},
|
||||
{}
|
||||
};
|
||||
|
|
|
@ -388,7 +388,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(0x046d, 0x0920)},
|
||||
{USB_DEVICE(0x046d, 0x0921)},
|
||||
{USB_DEVICE(0x0545, 0x808b)},
|
||||
|
|
|
@ -4192,7 +4192,7 @@ static const struct sd_desc sd_desc = {
|
|||
#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)},
|
||||
|
|
|
@ -3270,7 +3270,7 @@ static const struct sd_desc sd_desc_isoc_nego = {
|
|||
};
|
||||
|
||||
/* -- 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 },
|
||||
|
|
|
@ -6909,7 +6909,7 @@ static const struct sd_desc sd_desc = {
|
|||
#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},
|
||||
|
|
Загрузка…
Ссылка в новой задаче