summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-06 14:03:13 +1100
committerJens Axboe <axboe@kernel.dk>2013-02-06 09:34:20 +0100
commit82bed4d5f8189a2f9db5d1bb6489ac2615426d65 (patch)
tree542894373fc2e22d49cc22c6b70d9ec7111c2676
parent8722ff8cdbfac9c1b20e67bb067b455c48cb8e93 (diff)
downloadlinux-stable-82bed4d5f8189a2f9db5d1bb6489ac2615426d65.tar.gz
linux-stable-82bed4d5f8189a2f9db5d1bb6489ac2615426d65.tar.bz2
linux-stable-82bed4d5f8189a2f9db5d1bb6489ac2615426d65.zip
block: remove new __devinit/exit annotations on ramsam driver
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--drivers/block/rsxx/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index f75219140e70..83dadbee0375 100644
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -319,7 +319,7 @@ static int rsxx_compatibility_check(struct rsxx_cardinfo *card)
return 0;
}
-static int __devinit rsxx_pci_probe(struct pci_dev *dev,
+static int rsxx_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
struct rsxx_cardinfo *card;
@@ -510,7 +510,7 @@ failed_ida_get:
return st;
}
-static void __devexit rsxx_pci_remove(struct pci_dev *dev)
+static void rsxx_pci_remove(struct pci_dev *dev)
{
struct rsxx_cardinfo *card = pci_get_drvdata(dev);
unsigned long flags;
@@ -608,7 +608,7 @@ static struct pci_driver rsxx_pci_driver = {
.name = DRIVER_NAME,
.id_table = rsxx_pci_ids,
.probe = rsxx_pci_probe,
- .remove = __devexit_p(rsxx_pci_remove),
+ .remove = rsxx_pci_remove,
.suspend = rsxx_pci_suspend,
.shutdown = rsxx_pci_shutdown,
};