summaryrefslogtreecommitdiff
path: root/drivers/ntb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-18 07:17:42 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-18 07:17:42 +0400
commit78a61ab79ae6bd75593b63fbaf5299c96bac0ea4 (patch)
treeb475dddeebcc1b5d93fad0931f1e5df75aec0e3f /drivers/ntb
parent548c237c0a9972df5d1afaca38aa733ee577128d (diff)
downloadlinux-78a61ab79ae6bd75593b63fbaf5299c96bac0ea4.tar.xz
ntb: remove __dev* markings
These are now gone from the kernel, so remove them from the newly-added drivers before they start to cause build errors for people. Cc: Jon Mason <jon.mason@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ntb')
-rw-r--r--drivers/ntb/ntb_hw.c16
-rw-r--r--drivers/ntb/ntb_transport.c4
2 files changed, 9 insertions, 11 deletions
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index facad51fbc7a..4c71b17f0166 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -637,7 +637,7 @@ static int ntb_bwd_setup(struct ntb_device *ndev)
return 0;
}
-static int __devinit ntb_device_setup(struct ntb_device *ndev)
+static int ntb_device_setup(struct ntb_device *ndev)
{
int rc;
@@ -909,7 +909,7 @@ static int ntb_setup_intx(struct ntb_device *ndev)
return 0;
}
-static int __devinit ntb_setup_interrupts(struct ntb_device *ndev)
+static int ntb_setup_interrupts(struct ntb_device *ndev)
{
int rc;
@@ -943,7 +943,7 @@ done:
return 0;
}
-static void __devexit ntb_free_interrupts(struct ntb_device *ndev)
+static void ntb_free_interrupts(struct ntb_device *ndev)
{
struct pci_dev *pdev = ndev->pdev;
@@ -973,7 +973,7 @@ static void __devexit ntb_free_interrupts(struct ntb_device *ndev)
}
}
-static int __devinit ntb_create_callbacks(struct ntb_device *ndev)
+static int ntb_create_callbacks(struct ntb_device *ndev)
{
int i;
@@ -1006,9 +1006,7 @@ static void ntb_free_callbacks(struct ntb_device *ndev)
kfree(ndev->db_cb);
}
-static int __devinit
-ntb_pci_probe(struct pci_dev *pdev,
- __attribute__((unused)) const struct pci_device_id *id)
+static int ntb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
struct ntb_device *ndev;
int rc, i;
@@ -1122,7 +1120,7 @@ err:
return rc;
}
-static void __devexit ntb_pci_remove(struct pci_dev *pdev)
+static void ntb_pci_remove(struct pci_dev *pdev)
{
struct ntb_device *ndev = pci_get_drvdata(pdev);
int i;
@@ -1152,6 +1150,6 @@ static struct pci_driver ntb_pci_driver = {
.name = KBUILD_MODNAME,
.id_table = ntb_pci_tbl,
.probe = ntb_pci_probe,
- .remove = __devexit_p(ntb_pci_remove),
+ .remove = ntb_pci_remove,
};
module_pci_driver(ntb_pci_driver);
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c
index c907e0773532..250190fba757 100644
--- a/drivers/ntb/ntb_transport.c
+++ b/drivers/ntb/ntb_transport.c
@@ -217,7 +217,7 @@ struct bus_type ntb_bus_type = {
static LIST_HEAD(ntb_transport_list);
-static int __devinit ntb_bus_init(struct ntb_transport *nt)
+static int ntb_bus_init(struct ntb_transport *nt)
{
if (list_empty(&ntb_transport_list)) {
int rc = bus_register(&ntb_bus_type);
@@ -230,7 +230,7 @@ static int __devinit ntb_bus_init(struct ntb_transport *nt)
return 0;
}
-static void __devexit ntb_bus_remove(struct ntb_transport *nt)
+static void ntb_bus_remove(struct ntb_transport *nt)
{
struct ntb_transport_client_dev *client_dev, *cd;