Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+11 -13
+3 -4
drivers/message/fusion/mptfc.c
··· 100 100 static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt); 101 101 static void mptfc_target_destroy(struct scsi_target *starget); 102 102 static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout); 103 - static void __devexit mptfc_remove(struct pci_dev *pdev); 103 + static void mptfc_remove(struct pci_dev *pdev); 104 104 static int mptfc_abort(struct scsi_cmnd *SCpnt); 105 105 static int mptfc_dev_reset(struct scsi_cmnd *SCpnt); 106 106 static int mptfc_bus_reset(struct scsi_cmnd *SCpnt); ··· 1360 1360 .name = "mptfc", 1361 1361 .id_table = mptfc_pci_table, 1362 1362 .probe = mptfc_probe, 1363 - .remove = __devexit_p(mptfc_remove), 1363 + .remove = mptfc_remove, 1364 1364 .shutdown = mptscsih_shutdown, 1365 1365 #ifdef CONFIG_PM 1366 1366 .suspend = mptscsih_suspend, ··· 1496 1496 * @pdev: Pointer to pci_dev structure 1497 1497 * 1498 1498 */ 1499 - static void __devexit 1500 - mptfc_remove(struct pci_dev *pdev) 1499 + static void mptfc_remove(struct pci_dev *pdev) 1501 1500 { 1502 1501 MPT_ADAPTER *ioc = pci_get_drvdata(pdev); 1503 1502 struct mptfc_rport_info *p, *n;
+2 -2
drivers/message/fusion/mptsas.c
··· 5332 5332 mptsas_cleanup_fw_event_q(ioc); 5333 5333 } 5334 5334 5335 - static void __devexit mptsas_remove(struct pci_dev *pdev) 5335 + static void mptsas_remove(struct pci_dev *pdev) 5336 5336 { 5337 5337 MPT_ADAPTER *ioc = pci_get_drvdata(pdev); 5338 5338 struct mptsas_portinfo *p, *n; ··· 5387 5387 .name = "mptsas", 5388 5388 .id_table = mptsas_pci_table, 5389 5389 .probe = mptsas_probe, 5390 - .remove = __devexit_p(mptsas_remove), 5390 + .remove = mptsas_remove, 5391 5391 .shutdown = mptsas_shutdown, 5392 5392 #ifdef CONFIG_PM 5393 5393 .suspend = mptscsih_suspend,
+1 -1
drivers/message/fusion/mptspi.c
··· 1550 1550 .name = "mptspi", 1551 1551 .id_table = mptspi_pci_table, 1552 1552 .probe = mptspi_probe, 1553 - .remove = __devexit_p(mptscsih_remove), 1553 + .remove = mptscsih_remove, 1554 1554 .shutdown = mptscsih_shutdown, 1555 1555 #ifdef CONFIG_PM 1556 1556 .suspend = mptscsih_suspend,
+5 -6
drivers/message/i2o/pci.c
··· 37 37 #define OSM_DESCRIPTION "I2O-subsystem" 38 38 39 39 /* PCI device id table for all I2O controllers */ 40 - static struct pci_device_id __devinitdata i2o_pci_ids[] = { 40 + static struct pci_device_id i2o_pci_ids[] = { 41 41 {PCI_DEVICE_CLASS(PCI_CLASS_INTELLIGENT_I2O << 8, 0xffff00)}, 42 42 {PCI_DEVICE(PCI_VENDOR_ID_DPT, 0xa511)}, 43 43 {.vendor = PCI_VENDOR_ID_INTEL,.device = 0x1962, ··· 84 84 * 85 85 * Returns 0 on success or negative error code on failure. 86 86 */ 87 - static int __devinit i2o_pci_alloc(struct i2o_controller *c) 87 + static int i2o_pci_alloc(struct i2o_controller *c) 88 88 { 89 89 struct pci_dev *pdev = c->pdev; 90 90 struct device *dev = &pdev->dev; ··· 315 315 * 316 316 * Returns 0 on success or negative error code on failure. 317 317 */ 318 - static int __devinit i2o_pci_probe(struct pci_dev *pdev, 319 - const struct pci_device_id *id) 318 + static int i2o_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 320 319 { 321 320 struct i2o_controller *c; 322 321 int rc; ··· 452 453 * Reset the I2O controller, disable interrupts and remove all allocated 453 454 * resources. 454 455 */ 455 - static void __devexit i2o_pci_remove(struct pci_dev *pdev) 456 + static void i2o_pci_remove(struct pci_dev *pdev) 456 457 { 457 458 struct i2o_controller *c; 458 459 c = pci_get_drvdata(pdev); ··· 473 474 .name = "PCI_I2O", 474 475 .id_table = i2o_pci_ids, 475 476 .probe = i2o_pci_probe, 476 - .remove = __devexit_p(i2o_pci_remove), 477 + .remove = i2o_pci_remove, 477 478 }; 478 479 479 480 /**