dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Drivers: parport: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Matt Porter <mporter@ti.com>
Cc: Kay Sievers <kay@vrfy.org>
Cc: Gianluca Anzolin <gianluca@sottospazio.it>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:23:14 -08:00
parent fc52692c49
commit 312facaf92
4 changed files with 50 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/parport/parport_gsc.c
View File

@ -137,7 +137,7 @@ struct parport_operations parport_gsc_ops =
/* /*
* Checks for port existence, all ports support SPP MODE * Checks for port existence, all ports support SPP MODE
*/ */
static int __devinit parport_SPP_supported(struct parport *pb) static int parport_SPP_supported(struct parport *pb)
{ {
unsigned char r, w; unsigned char r, w;
@ -201,7 +201,7 @@ static int __devinit parport_SPP_supported(struct parport *pb)
* be misdetected here is rather academic. * be misdetected here is rather academic.
*/ */
static int __devinit parport_PS2_supported(struct parport *pb) static int parport_PS2_supported(struct parport *pb)
{ {
int ok = 0; int ok = 0;
@ -232,10 +232,9 @@ static int __devinit parport_PS2_supported(struct parport *pb)
/* --- Initialisation code -------------------------------- */ /* --- Initialisation code -------------------------------- */
struct parport *__devinit parport_gsc_probe_port (unsigned long base, struct parport *parport_gsc_probe_port(unsigned long base,
unsigned long base_hi, unsigned long base_hi, int irq,
int irq, int dma, int dma, struct pci_dev *dev)
struct pci_dev *dev)
{ {
struct parport_gsc_private *priv; struct parport_gsc_private *priv;
struct parport_operations *ops; struct parport_operations *ops;
@ -345,9 +344,9 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,
#define PARPORT_GSC_OFFSET 0x800 #define PARPORT_GSC_OFFSET 0x800
static int __devinitdata parport_count; static int parport_count;
static int __devinit parport_init_chip(struct parisc_device *dev) static int parport_init_chip(struct parisc_device *dev)
{ {
struct parport *p; struct parport *p;
unsigned long port; unsigned long port;
@ -382,7 +381,7 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
return 0; return 0;
} }
static int __devexit parport_remove_chip(struct parisc_device *dev) static int parport_remove_chip(struct parisc_device *dev)
{ {
struct parport *p = dev_get_drvdata(&dev->dev); struct parport *p = dev_get_drvdata(&dev->dev);
if (p) { if (p) {
@ -415,15 +414,15 @@ static struct parisc_driver parport_driver = {
.name = "Parallel", .name = "Parallel",
.id_table = parport_tbl, .id_table = parport_tbl,
.probe = parport_init_chip, .probe = parport_init_chip,
.remove = __devexit_p(parport_remove_chip), .remove = parport_remove_chip,
}; };
int __devinit parport_gsc_init(void) int parport_gsc_init(void)
{ {
return register_parisc_driver(&parport_driver); return register_parisc_driver(&parport_driver);
} }
static void __devexit parport_gsc_exit(void) static void parport_gsc_exit(void)
{ {
unregister_parisc_driver(&parport_driver); unregister_parisc_driver(&parport_driver);
} }

55
drivers/parport/parport_pc.c
View File

@ -953,7 +953,7 @@ static struct superio_struct *find_free_superio(void)
/* Super-IO chipset detection, Winbond, SMSC */ /* Super-IO chipset detection, Winbond, SMSC */
static void __devinit show_parconfig_smsc37c669(int io, int key) static void show_parconfig_smsc37c669(int io, int key)
{ {
int cr1, cr4, cra, cr23, cr26, cr27; int cr1, cr4, cra, cr23, cr26, cr27;
struct superio_struct *s; struct superio_struct *s;
@ -1038,7 +1038,7 @@ static void __devinit show_parconfig_smsc37c669(int io, int key)
} }
static void __devinit show_parconfig_winbond(int io, int key) static void show_parconfig_winbond(int io, int key)
{ {
int cr30, cr60, cr61, cr70, cr74, crf0; int cr30, cr60, cr61, cr70, cr74, crf0;
struct superio_struct *s; struct superio_struct *s;
@ -1106,8 +1106,7 @@ static void __devinit show_parconfig_winbond(int io, int key)
} }
} }
static void __devinit decode_winbond(int efer, int key, int devid, static void decode_winbond(int efer, int key, int devid, int devrev, int oldid)
int devrev, int oldid)
{ {
const char *type = "unknown"; const char *type = "unknown";
int id, progif = 2; int id, progif = 2;
@ -1159,7 +1158,7 @@ static void __devinit decode_winbond(int efer, int key, int devid,
show_parconfig_winbond(efer, key); show_parconfig_winbond(efer, key);
} }
static void __devinit decode_smsc(int efer, int key, int devid, int devrev) static void decode_smsc(int efer, int key, int devid, int devrev)
{ {
const char *type = "unknown"; const char *type = "unknown";
void (*func)(int io, int key); void (*func)(int io, int key);
@ -1193,7 +1192,7 @@ static void __devinit decode_smsc(int efer, int key, int devid, int devrev)
} }
static void __devinit winbond_check(int io, int key) static void winbond_check(int io, int key)
{ {
int origval, devid, devrev, oldid, x_devid, x_devrev, x_oldid; int origval, devid, devrev, oldid, x_devid, x_devrev, x_oldid;
@ -1231,7 +1230,7 @@ out:
release_region(io, 3); release_region(io, 3);
} }
static void __devinit winbond_check2(int io, int key) static void winbond_check2(int io, int key)
{ {
int origval[3], devid, devrev, oldid, x_devid, x_devrev, x_oldid; int origval[3], devid, devrev, oldid, x_devid, x_devrev, x_oldid;
@ -1272,7 +1271,7 @@ out:
release_region(io, 3); release_region(io, 3);
} }
static void __devinit smsc_check(int io, int key) static void smsc_check(int io, int key)
{ {
int origval, id, rev, oldid, oldrev, x_id, x_rev, x_oldid, x_oldrev; int origval, id, rev, oldid, oldrev, x_id, x_rev, x_oldid, x_oldrev;
@ -1316,7 +1315,7 @@ out:
} }
static void __devinit detect_and_report_winbond(void) static void detect_and_report_winbond(void)
{ {
if (verbose_probing) if (verbose_probing)
printk(KERN_DEBUG "Winbond Super-IO detection, now testing ports 3F0,370,250,4E,2E ...\n"); printk(KERN_DEBUG "Winbond Super-IO detection, now testing ports 3F0,370,250,4E,2E ...\n");
@ -1329,7 +1328,7 @@ static void __devinit detect_and_report_winbond(void)
winbond_check2(0x250, 0x89); winbond_check2(0x250, 0x89);
} }
static void __devinit detect_and_report_smsc(void) static void detect_and_report_smsc(void)
{ {
if (verbose_probing) if (verbose_probing)
printk(KERN_DEBUG "SMSC Super-IO detection, now testing Ports 2F0, 370 ...\n"); printk(KERN_DEBUG "SMSC Super-IO detection, now testing Ports 2F0, 370 ...\n");
@ -1339,7 +1338,7 @@ static void __devinit detect_and_report_smsc(void)
smsc_check(0x370, 0x44); smsc_check(0x370, 0x44);
} }
static void __devinit detect_and_report_it87(void) static void detect_and_report_it87(void)
{ {
u16 dev; u16 dev;
u8 origval, r; u8 origval, r;
@ -1796,24 +1795,24 @@ static int parport_ECPEPP_supported(struct parport *pb)
#else /* No IEEE 1284 support */ #else /* No IEEE 1284 support */
/* Don't bother probing for modes we know we won't use. */ /* Don't bother probing for modes we know we won't use. */
static int __devinit parport_PS2_supported(struct parport *pb) { return 0; } static int parport_PS2_supported(struct parport *pb) { return 0; }
#ifdef CONFIG_PARPORT_PC_FIFO #ifdef CONFIG_PARPORT_PC_FIFO
static int parport_ECP_supported(struct parport *pb) static int parport_ECP_supported(struct parport *pb)
{ {
return 0; return 0;
} }
#endif #endif
static int __devinit parport_EPP_supported(struct parport *pb) static int parport_EPP_supported(struct parport *pb)
{ {
return 0; return 0;
} }
static int __devinit parport_ECPEPP_supported(struct parport *pb) static int parport_ECPEPP_supported(struct parport *pb)
{ {
return 0; return 0;
} }
static int __devinit parport_ECPPS2_supported(struct parport *pb) static int parport_ECPPS2_supported(struct parport *pb)
{ {
return 0; return 0;
} }
@ -2269,9 +2268,8 @@ EXPORT_SYMBOL(parport_pc_unregister_port);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* ITE support maintained by Rich Liu <richliu@poorman.org> */ /* ITE support maintained by Rich Liu <richliu@poorman.org> */
static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,
int autodma, const struct parport_pc_via_data *via)
const struct parport_pc_via_data *via)
{ {
short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 }; short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 };
u32 ite8872set; u32 ite8872set;
@ -2377,10 +2375,10 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
/* VIA 8231 support by Pavel Fedin <sonic_amiga@rambler.ru> /* VIA 8231 support by Pavel Fedin <sonic_amiga@rambler.ru>
based on VIA 686a support code by Jeff Garzik <jgarzik@pobox.com> */ based on VIA 686a support code by Jeff Garzik <jgarzik@pobox.com> */
static int __devinitdata parport_init_mode; static int parport_init_mode;
/* Data for two known VIA chips */ /* Data for two known VIA chips */
static struct parport_pc_via_data via_686a_data __devinitdata = { static struct parport_pc_via_data via_686a_data = {
0x51, 0x51,
0x50, 0x50,
0x85, 0x85,
@ -2389,7 +2387,7 @@ static struct parport_pc_via_data via_686a_data __devinitdata = {
0xF0, 0xF0,
0xE6 0xE6
}; };
static struct parport_pc_via_data via_8231_data __devinitdata = { static struct parport_pc_via_data via_8231_data = {
0x45, 0x45,
0x44, 0x44,
0x50, 0x50,
@ -2399,9 +2397,8 @@ static struct parport_pc_via_data via_8231_data __devinitdata = {
0xF6 0xF6
}; };
static int __devinit sio_via_probe(struct pci_dev *pdev, int autoirq, static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
int autodma, const struct parport_pc_via_data *via)
const struct parport_pc_via_data *via)
{ {
u8 tmp, tmp2, siofunc; u8 tmp, tmp2, siofunc;
u8 ppcontrol = 0; u8 ppcontrol = 0;
@ -2575,7 +2572,7 @@ static struct parport_pc_superio {
int (*probe) (struct pci_dev *pdev, int autoirq, int autodma, int (*probe) (struct pci_dev *pdev, int autoirq, int autodma,
const struct parport_pc_via_data *via); const struct parport_pc_via_data *via);
const struct parport_pc_via_data *via; const struct parport_pc_via_data *via;
} parport_pc_superio_info[] __devinitdata = { } parport_pc_superio_info[] = {
{ sio_via_probe, &via_686a_data, }, { sio_via_probe, &via_686a_data, },
{ sio_via_probe, &via_8231_data, }, { sio_via_probe, &via_8231_data, },
{ sio_ite_8872_probe, NULL, }, { sio_ite_8872_probe, NULL, },
@ -2860,7 +2857,7 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
return -ENODEV; return -ENODEV;
} }
static void __devexit parport_pc_pci_remove(struct pci_dev *dev) static void parport_pc_pci_remove(struct pci_dev *dev)
{ {
struct pci_parport_data *data = pci_get_drvdata(dev); struct pci_parport_data *data = pci_get_drvdata(dev);
int i; int i;
@ -2879,7 +2876,7 @@ static struct pci_driver parport_pc_pci_driver = {
.name = "parport_pc", .name = "parport_pc",
.id_table = parport_pc_pci_tbl, .id_table = parport_pc_pci_tbl,
.probe = parport_pc_pci_probe, .probe = parport_pc_pci_probe,
.remove = __devexit_p(parport_pc_pci_remove), .remove = parport_pc_pci_remove,
}; };
static int __init parport_pc_init_superio(int autoirq, int autodma) static int __init parport_pc_init_superio(int autoirq, int autodma)
@ -2983,7 +2980,7 @@ static struct pnp_driver parport_pc_pnp_driver = {
static struct pnp_driver parport_pc_pnp_driver; static struct pnp_driver parport_pc_pnp_driver;
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
static int __devinit parport_pc_platform_probe(struct platform_device *pdev) static int parport_pc_platform_probe(struct platform_device *pdev)
{ {
/* Always succeed, the actual probing is done in /* Always succeed, the actual probing is done in
* parport_pc_probe_port(). */ * parport_pc_probe_port(). */
@ -2999,7 +2996,7 @@ static struct platform_driver parport_pc_platform_driver = {
}; };
/* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */ /* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */
static int __devinit __attribute__((unused)) static int __attribute__((unused))
parport_pc_find_isa_ports(int autoirq, int autodma) parport_pc_find_isa_ports(int autoirq, int autodma)
{ {
int count = 0; int count = 0;

21
drivers/parport/parport_serial.c
View File

@ -87,7 +87,8 @@ struct parport_pc_pci {
struct parport_pc_pci *card, int failed); struct parport_pc_pci *card, int failed);
}; };
static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par, int autoirq, int autodma) static int netmos_parallel_init(struct pci_dev *dev, struct parport_pc_pci *par,
int autoirq, int autodma)
{ {
/* the rule described below doesn't hold for this device */ /* the rule described below doesn't hold for this device */
if (dev->device == PCI_DEVICE_ID_NETMOS_9835 && if (dev->device == PCI_DEVICE_ID_NETMOS_9835 &&
@ -111,7 +112,7 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc
return 0; return 0;
} }
static struct parport_pc_pci cards[] __devinitdata = { static struct parport_pc_pci cards[] = {
/* titan_110l */ { 1, { { 3, -1 }, } }, /* titan_110l */ { 1, { { 3, -1 }, } },
/* titan_210l */ { 1, { { 3, -1 }, } }, /* titan_210l */ { 1, { { 3, -1 }, } },
/* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init }, /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init },
@ -258,7 +259,7 @@ MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl);
* Cards not tested are marked n/t * Cards not tested are marked n/t
* If you have one of these cards and it works for you, please tell me.. * If you have one of these cards and it works for you, please tell me..
*/ */
static struct pciserial_board pci_parport_serial_boards[] __devinitdata = { static struct pciserial_board pci_parport_serial_boards[] = {
[titan_110l] = { [titan_110l] = {
.flags = FL_BASE1 | FL_BASE_BARS, .flags = FL_BASE1 | FL_BASE_BARS,
.num_ports = 1, .num_ports = 1,
@ -479,8 +480,7 @@ struct parport_serial_private {
}; };
/* Register the serial port(s) of a PCI card. */ /* Register the serial port(s) of a PCI card. */
static int __devinit serial_register (struct pci_dev *dev, static int serial_register(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct parport_serial_private *priv = pci_get_drvdata (dev); struct parport_serial_private *priv = pci_get_drvdata (dev);
struct pciserial_board *board; struct pciserial_board *board;
@ -501,8 +501,7 @@ static int __devinit serial_register (struct pci_dev *dev,
} }
/* Register the parallel port(s) of a PCI card. */ /* Register the parallel port(s) of a PCI card. */
static int __devinit parport_register (struct pci_dev *dev, static int parport_register(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct parport_pc_pci *card; struct parport_pc_pci *card;
struct parport_serial_private *priv = pci_get_drvdata (dev); struct parport_serial_private *priv = pci_get_drvdata (dev);
@ -563,8 +562,8 @@ static int __devinit parport_register (struct pci_dev *dev,
return 0; return 0;
} }
static int __devinit parport_serial_pci_probe (struct pci_dev *dev, static int parport_serial_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct parport_serial_private *priv; struct parport_serial_private *priv;
int err; int err;
@ -599,7 +598,7 @@ static int __devinit parport_serial_pci_probe (struct pci_dev *dev,
return 0; return 0;
} }
static void __devexit parport_serial_pci_remove (struct pci_dev *dev) static void parport_serial_pci_remove(struct pci_dev *dev)
{ {
struct parport_serial_private *priv = pci_get_drvdata (dev); struct parport_serial_private *priv = pci_get_drvdata (dev);
int i; int i;
@ -664,7 +663,7 @@ static struct pci_driver parport_serial_pci_driver = {
.name = "parport_serial", .name = "parport_serial",
.id_table = parport_serial_pci_tbl, .id_table = parport_serial_pci_tbl,
.probe = parport_serial_pci_probe, .probe = parport_serial_pci_probe,
.remove = __devexit_p(parport_serial_pci_remove), .remove = parport_serial_pci_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = parport_serial_pci_suspend, .suspend = parport_serial_pci_suspend,
.resume = parport_serial_pci_resume, .resume = parport_serial_pci_resume,

6
drivers/parport/parport_sunbpp.c
View File

@ -265,7 +265,7 @@ static struct parport_operations parport_sunbpp_ops =
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __devinit bpp_probe(struct platform_device *op) static int bpp_probe(struct platform_device *op)
{ {
struct parport_operations *ops; struct parport_operations *ops;
struct bpp_regs __iomem *regs; struct bpp_regs __iomem *regs;
@ -330,7 +330,7 @@ out_unmap:
return err; return err;
} }
static int __devexit bpp_remove(struct platform_device *op) static int bpp_remove(struct platform_device *op)
{ {
struct parport *p = dev_get_drvdata(&op->dev); struct parport *p = dev_get_drvdata(&op->dev);
struct parport_operations *ops = p->ops; struct parport_operations *ops = p->ops;
@ -367,7 +367,7 @@ static struct platform_driver bpp_sbus_driver = {
.of_match_table = bpp_match, .of_match_table = bpp_match,
}, },
.probe = bpp_probe, .probe = bpp_probe,
.remove = __devexit_p(bpp_remove), .remove = bpp_remove,
}; };
module_platform_driver(bpp_sbus_driver); module_platform_driver(bpp_sbus_driver);