kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ioc3/ioc4: various section fixes

Browse source 
Several IOC3 and IOC4 drivers misuse the __devinit and __devexit section
markers.  Use __init and __exit instead as appropriate, then add __devinit
and __devexit where they really belong for PCI drivers.

Also make ioc4_serial_init static.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Pat Gefre <pfg@sgi.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jean Delvare 2009-12-14 18:00:27 -08:00 committed by Linus Torvalds
parent e4c570c4cb
commit 2ea5d35a49
4 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/misc/ioc4.c
View file

@ -138,7 +138,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is)
* even though the following code utilizes external interrupt registers * even though the following code utilizes external interrupt registers
* to perform the speed calculation. * to perform the speed calculation.
*/ */
static void static void __devinit
ioc4_clock_calibrate(struct ioc4_driver_data *idd) ioc4_clock_calibrate(struct ioc4_driver_data *idd)
{ {
union ioc4_int_out int_out; union ioc4_int_out int_out;
@ -230,7 +230,7 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd)
* on the same PCI bus at slot number 3 to differentiate IO9 from IO10. * on the same PCI bus at slot number 3 to differentiate IO9 from IO10.
* If neither is present, it's a PCI-RT. * If neither is present, it's a PCI-RT.
*/ */
static unsigned int static unsigned int __devinit
ioc4_variant(struct ioc4_driver_data *idd) ioc4_variant(struct ioc4_driver_data *idd)
{ {
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
@ -269,7 +269,7 @@ ioc4_variant(struct ioc4_driver_data *idd)
return IOC4_VARIANT_PCI_RT; return IOC4_VARIANT_PCI_RT;
} }
static void static void __devinit
ioc4_load_modules(struct work_struct *work) ioc4_load_modules(struct work_struct *work)
{ {
/* arg just has to be freed */ /* arg just has to be freed */
@ -280,7 +280,7 @@ ioc4_load_modules(struct work_struct *work)
} }
/* Adds a new instance of an IOC4 card */ /* Adds a new instance of an IOC4 card */
static int static int __devinit
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
{ {
struct ioc4_driver_data *idd; struct ioc4_driver_data *idd;
@ -425,7 +425,7 @@ out:
} }
/* Removes a particular instance of an IOC4 card. */ /* Removes a particular instance of an IOC4 card. */
static void static void __devexit
ioc4_remove(struct pci_dev *pdev) ioc4_remove(struct pci_dev *pdev)
{ {
struct ioc4_submodule *is; struct ioc4_submodule *is;
@ -476,7 +476,7 @@ static struct pci_driver ioc4_driver = {
.name = "IOC4", .name = "IOC4",
.id_table = ioc4_id_table, .id_table = ioc4_id_table,
.probe = ioc4_probe, .probe = ioc4_probe,
.remove = ioc4_remove, .remove = __devexit_p(ioc4_remove),
}; };
MODULE_DEVICE_TABLE(pci, ioc4_id_table); MODULE_DEVICE_TABLE(pci, ioc4_id_table);
@ -486,14 +486,14 @@ MODULE_DEVICE_TABLE(pci, ioc4_id_table);
*********************/ *********************/
/* Module load */ /* Module load */
static int __devinit static int __init
ioc4_init(void) ioc4_init(void)
{ {
return pci_register_driver(&ioc4_driver); return pci_register_driver(&ioc4_driver);
} }
/* Module unload */ /* Module unload */
static void __devexit static void __exit
ioc4_exit(void) ioc4_exit(void)
{ {
/* Ensure ioc4_load_modules() has completed before exiting */ /* Ensure ioc4_load_modules() has completed before exiting */

4
drivers/serial/ioc3_serial.c
View file

@ -2162,7 +2162,7 @@ static struct ioc3_submodule ioc3uart_ops = {
/** /**
* ioc3_detect - module init called, * ioc3_detect - module init called,
*/ */
static int __devinit ioc3uart_init(void) static int __init ioc3uart_init(void)
{ {
int ret; int ret;
@ -2179,7 +2179,7 @@ static int __devinit ioc3uart_init(void)
return ret; return ret;
} }
static void __devexit ioc3uart_exit(void) static void __exit ioc3uart_exit(void)
{ {
ioc3_unregister_submodule(&ioc3uart_ops); ioc3_unregister_submodule(&ioc3uart_ops);
uart_unregister_driver(&ioc3_uart); uart_unregister_driver(&ioc3_uart);

4
drivers/serial/ioc4_serial.c
View file

@ -2904,7 +2904,7 @@ static struct ioc4_submodule ioc4_serial_submodule = {
/** /**
* ioc4_serial_init - module init * ioc4_serial_init - module init
*/ */
int ioc4_serial_init(void) static int __init ioc4_serial_init(void)
{ {
int ret; int ret;
@ -2926,7 +2926,7 @@ int ioc4_serial_init(void)
return ioc4_register_submodule(&ioc4_serial_submodule); return ioc4_register_submodule(&ioc4_serial_submodule);
} }
static void __devexit ioc4_serial_exit(void) static void __exit ioc4_serial_exit(void)
{ {
ioc4_unregister_submodule(&ioc4_serial_submodule); ioc4_unregister_submodule(&ioc4_serial_submodule);
uart_unregister_driver(&ioc4_uart_rs232); uart_unregister_driver(&ioc4_uart_rs232);

15
drivers/sn/ioc3.c
View file

@ -574,11 +574,11 @@ void ioc3_unregister_submodule(struct ioc3_submodule *is)
* Device management * * Device management *
*********************/ *********************/
static char * static char * __devinitdata
ioc3_class_names[]={"unknown", "IP27 BaseIO", "IP30 system", "MENET 1/2/3", ioc3_class_names[]={"unknown", "IP27 BaseIO", "IP30 system", "MENET 1/2/3",
"MENET 4", "CADduo", "Altix Serial"}; "MENET 4", "CADduo", "Altix Serial"};
static int ioc3_class(struct ioc3_driver_data *idd) static int __devinit ioc3_class(struct ioc3_driver_data *idd)
{ {
int res = IOC3_CLASS_NONE; int res = IOC3_CLASS_NONE;
/* NIC-based logic */ /* NIC-based logic */
@ -601,7 +601,8 @@ static int ioc3_class(struct ioc3_driver_data *idd)
return res; return res;
} }
/* Adds a new instance of an IOC3 card */ /* Adds a new instance of an IOC3 card */
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) static int __devinit
ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
{ {
struct ioc3_driver_data *idd; struct ioc3_driver_data *idd;
uint32_t pcmd; uint32_t pcmd;
@ -753,7 +754,7 @@ out:
} }
/* Removes a particular instance of an IOC3 card. */ /* Removes a particular instance of an IOC3 card. */
static void ioc3_remove(struct pci_dev *pdev) static void __devexit ioc3_remove(struct pci_dev *pdev)
{ {
int id; int id;
struct ioc3_driver_data *idd; struct ioc3_driver_data *idd;
@ -805,7 +806,7 @@ static struct pci_driver ioc3_driver = {
.name = "IOC3", .name = "IOC3",
.id_table = ioc3_id_table, .id_table = ioc3_id_table,
.probe = ioc3_probe, .probe = ioc3_probe,
.remove = ioc3_remove, .remove = __devexit_p(ioc3_remove),
}; };
MODULE_DEVICE_TABLE(pci, ioc3_id_table); MODULE_DEVICE_TABLE(pci, ioc3_id_table);
@ -815,7 +816,7 @@ MODULE_DEVICE_TABLE(pci, ioc3_id_table);
*********************/ *********************/
/* Module load */ /* Module load */
static int __devinit ioc3_init(void) static int __init ioc3_init(void)
{ {
if (ia64_platform_is("sn2")) if (ia64_platform_is("sn2"))
return pci_register_driver(&ioc3_driver); return pci_register_driver(&ioc3_driver);
@ -823,7 +824,7 @@ static int __devinit ioc3_init(void)
} }
/* Module unload */ /* Module unload */
static void __devexit ioc3_exit(void) static void __exit ioc3_exit(void)
{ {
pci_unregister_driver(&ioc3_driver); pci_unregister_driver(&ioc3_driver);
} }