Drivers: scsi: 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, __devinitconst, 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: Adam Radford <linuxraid@lsi.com> Cc: "James E.J. Bottomley" <JBottomley@parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -397,7 +397,7 @@ static void pvscsi_unmap_buffers(const struct pvscsi_adapter *adapter,
|
||||
SCSI_SENSE_BUFFERSIZE, PCI_DMA_FROMDEVICE);
|
||||
}
|
||||
|
||||
static int __devinit pvscsi_allocate_rings(struct pvscsi_adapter *adapter)
|
||||
static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter)
|
||||
{
|
||||
adapter->rings_state = pci_alloc_consistent(adapter->dev, PAGE_SIZE,
|
||||
&adapter->ringStatePA);
|
||||
@@ -1152,7 +1152,7 @@ static void pvscsi_release_resources(struct pvscsi_adapter *adapter)
|
||||
* just use a statically allocated scatter list.
|
||||
*
|
||||
*/
|
||||
static int __devinit pvscsi_allocate_sg(struct pvscsi_adapter *adapter)
|
||||
static int pvscsi_allocate_sg(struct pvscsi_adapter *adapter)
|
||||
{
|
||||
struct pvscsi_ctx *ctx;
|
||||
int i;
|
||||
@@ -1233,8 +1233,7 @@ exit:
|
||||
return numPhys;
|
||||
}
|
||||
|
||||
static int __devinit pvscsi_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *id)
|
||||
static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
{
|
||||
struct pvscsi_adapter *adapter;
|
||||
struct Scsi_Host *host;
|
||||
@@ -1454,7 +1453,7 @@ static struct pci_driver pvscsi_pci_driver = {
|
||||
.name = "vmw_pvscsi",
|
||||
.id_table = pvscsi_pci_tbl,
|
||||
.probe = pvscsi_probe,
|
||||
.remove = __devexit_p(pvscsi_remove),
|
||||
.remove = pvscsi_remove,
|
||||
.shutdown = pvscsi_shutdown,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user