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

Drivers: message: 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: Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
Cc: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 15:04:26 -08:00
parent 1da42fb6bf
commit 47b1ea75fe
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/message/fusion/mptfc.c
View File

@ -100,7 +100,7 @@ static int mptfc_slave_alloc(struct scsi_device *sdev);
static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt); static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt);
static void mptfc_target_destroy(struct scsi_target *starget); static void mptfc_target_destroy(struct scsi_target *starget);
static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout); static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
static void __devexit mptfc_remove(struct pci_dev *pdev); static void mptfc_remove(struct pci_dev *pdev);
static int mptfc_abort(struct scsi_cmnd *SCpnt); static int mptfc_abort(struct scsi_cmnd *SCpnt);
static int mptfc_dev_reset(struct scsi_cmnd *SCpnt); static int mptfc_dev_reset(struct scsi_cmnd *SCpnt);
static int mptfc_bus_reset(struct scsi_cmnd *SCpnt); static int mptfc_bus_reset(struct scsi_cmnd *SCpnt);
@ -1360,7 +1360,7 @@ static struct pci_driver mptfc_driver = {
.name = "mptfc", .name = "mptfc",
.id_table = mptfc_pci_table, .id_table = mptfc_pci_table,
.probe = mptfc_probe, .probe = mptfc_probe,
.remove = __devexit_p(mptfc_remove), .remove = mptfc_remove,
.shutdown = mptscsih_shutdown, .shutdown = mptscsih_shutdown,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = mptscsih_suspend, .suspend = mptscsih_suspend,
@ -1496,8 +1496,7 @@ mptfc_init(void)
* @pdev: Pointer to pci_dev structure * @pdev: Pointer to pci_dev structure
* *
*/ */
static void __devexit static void mptfc_remove(struct pci_dev *pdev)
mptfc_remove(struct pci_dev *pdev)
{ {
MPT_ADAPTER *ioc = pci_get_drvdata(pdev); MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
struct mptfc_rport_info *p, *n; struct mptfc_rport_info *p, *n;

4
drivers/message/fusion/mptsas.c
View File

@ -5332,7 +5332,7 @@ mptsas_shutdown(struct pci_dev *pdev)
mptsas_cleanup_fw_event_q(ioc); mptsas_cleanup_fw_event_q(ioc);
} }
static void __devexit mptsas_remove(struct pci_dev *pdev) static void mptsas_remove(struct pci_dev *pdev)
{ {
MPT_ADAPTER *ioc = pci_get_drvdata(pdev); MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
struct mptsas_portinfo *p, *n; struct mptsas_portinfo *p, *n;
@ -5387,7 +5387,7 @@ static struct pci_driver mptsas_driver = {
.name = "mptsas", .name = "mptsas",
.id_table = mptsas_pci_table, .id_table = mptsas_pci_table,
.probe = mptsas_probe, .probe = mptsas_probe,
.remove = __devexit_p(mptsas_remove), .remove = mptsas_remove,
.shutdown = mptsas_shutdown, .shutdown = mptsas_shutdown,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = mptscsih_suspend, .suspend = mptscsih_suspend,

2
drivers/message/fusion/mptspi.c
View File

@ -1550,7 +1550,7 @@ static struct pci_driver mptspi_driver = {
.name = "mptspi", .name = "mptspi",
.id_table = mptspi_pci_table, .id_table = mptspi_pci_table,
.probe = mptspi_probe, .probe = mptspi_probe,
.remove = __devexit_p(mptscsih_remove), .remove = mptscsih_remove,
.shutdown = mptscsih_shutdown, .shutdown = mptscsih_shutdown,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = mptscsih_suspend, .suspend = mptscsih_suspend,

11
drivers/message/i2o/pci.c
View File

@ -37,7 +37,7 @@
#define OSM_DESCRIPTION "I2O-subsystem" #define OSM_DESCRIPTION "I2O-subsystem"
/* PCI device id table for all I2O controllers */ /* PCI device id table for all I2O controllers */
static struct pci_device_id __devinitdata i2o_pci_ids[] = { static struct pci_device_id i2o_pci_ids[] = {
{PCI_DEVICE_CLASS(PCI_CLASS_INTELLIGENT_I2O << 8, 0xffff00)}, {PCI_DEVICE_CLASS(PCI_CLASS_INTELLIGENT_I2O << 8, 0xffff00)},
{PCI_DEVICE(PCI_VENDOR_ID_DPT, 0xa511)}, {PCI_DEVICE(PCI_VENDOR_ID_DPT, 0xa511)},
{.vendor = PCI_VENDOR_ID_INTEL,.device = 0x1962, {.vendor = PCI_VENDOR_ID_INTEL,.device = 0x1962,
@ -84,7 +84,7 @@ static void i2o_pci_free(struct i2o_controller *c)
* *
* Returns 0 on success or negative error code on failure. * Returns 0 on success or negative error code on failure.
*/ */
static int __devinit i2o_pci_alloc(struct i2o_controller *c) static int i2o_pci_alloc(struct i2o_controller *c)
{ {
struct pci_dev *pdev = c->pdev; struct pci_dev *pdev = c->pdev;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -315,8 +315,7 @@ static void i2o_pci_irq_disable(struct i2o_controller *c)
* *
* Returns 0 on success or negative error code on failure. * Returns 0 on success or negative error code on failure.
*/ */
static int __devinit i2o_pci_probe(struct pci_dev *pdev, static int i2o_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct i2o_controller *c; struct i2o_controller *c;
int rc; int rc;
@ -453,7 +452,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
* Reset the I2O controller, disable interrupts and remove all allocated * Reset the I2O controller, disable interrupts and remove all allocated
* resources. * resources.
*/ */
static void __devexit i2o_pci_remove(struct pci_dev *pdev) static void i2o_pci_remove(struct pci_dev *pdev)
{ {
struct i2o_controller *c; struct i2o_controller *c;
c = pci_get_drvdata(pdev); c = pci_get_drvdata(pdev);
@ -474,7 +473,7 @@ static struct pci_driver i2o_pci_driver = {
.name = "PCI_I2O", .name = "PCI_I2O",
.id_table = i2o_pci_ids, .id_table = i2o_pci_ids,
.probe = i2o_pci_probe, .probe = i2o_pci_probe,
.remove = __devexit_p(i2o_pci_remove), .remove = i2o_pci_remove,
}; };
/** /**