vxge/s2io: remove __dev* attributes

[deliverable/linux.git] / drivers / net / ethernet / neterion / vxge / vxge-main.c

diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 3e5b7509502c6321b9065e14a39156b547b83878..bb5770fc650388fcbb23df8b9888f2dd39a11bc1 100644 (file)
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -3371,7 +3371,7 @@ static const struct net_device_ops vxge_netdev_ops = {
 #endif
 };
 
-static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
+static int vxge_device_register(struct __vxge_hw_device *hldev,
                                          struct vxge_config *config,
                                          int high_dma, int no_of_vpath,
                                          struct vxgedev **vdev_out)
@@ -3672,7 +3672,7 @@ static void verify_bandwidth(void)
 /*
  * Vpath configuration
  */
-static int __devinit vxge_config_vpaths(
+static int vxge_config_vpaths(
                        struct vxge_hw_device_config *device_config,
                        u64 vpath_mask, struct vxge_config *config_param)
 {
@@ -3859,7 +3859,7 @@ static int __devinit vxge_config_vpaths(
 }
 
 /* initialize device configuratrions */
-static void __devinit vxge_device_config_init(
+static void vxge_device_config_init(
                                struct vxge_hw_device_config *device_config,
                                int *intr_type)
 {
@@ -3912,7 +3912,7 @@ static void __devinit vxge_device_config_init(
                        device_config->rth_it_type);
 }
 
-static void __devinit vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)
+static void vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)
 {
        int i;
 
@@ -4269,7 +4269,7 @@ static int vxge_probe_fw_update(struct vxgedev *vdev)
        return ret;
 }
 
-static int __devinit is_sriov_initialized(struct pci_dev *pdev)
+static int is_sriov_initialized(struct pci_dev *pdev)
 {
        int pos;
        u16 ctrl;
@@ -4300,7 +4300,7 @@ static const struct vxge_hw_uld_cbs vxge_callbacks = {
  * returns 0 on success and negative on failure.
  *
  */
-static int __devinit
+static int
 vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
 {
        struct __vxge_hw_device *hldev;
@@ -4764,7 +4764,7 @@ _exit0:
  * Description: This function is called by the Pci subsystem to release a
  * PCI device and free up all resource held up by the device.
  */
-static void __devexit vxge_remove(struct pci_dev *pdev)
+static void vxge_remove(struct pci_dev *pdev)
 {
        struct __vxge_hw_device *hldev;
        struct vxgedev *vdev;
@@ -4809,7 +4809,7 @@ static struct pci_driver vxge_driver = {
        .name = VXGE_DRIVER_NAME,
        .id_table = vxge_id_table,
        .probe = vxge_probe,
-       .remove = __devexit_p(vxge_remove),
+       .remove = vxge_remove,
 #ifdef CONFIG_PM
        .suspend = vxge_pm_suspend,
        .resume = vxge_pm_resume,