Commit 3a036ce5 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

vxge/s2io: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Jon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6980cbe4
...@@ -494,7 +494,7 @@ static struct pci_driver s2io_driver = { ...@@ -494,7 +494,7 @@ static struct pci_driver s2io_driver = {
.name = "S2IO", .name = "S2IO",
.id_table = s2io_tbl, .id_table = s2io_tbl,
.probe = s2io_init_nic, .probe = s2io_init_nic,
.remove = __devexit_p(s2io_rem_nic), .remove = s2io_rem_nic,
.err_handler = &s2io_err_handler, .err_handler = &s2io_err_handler,
}; };
...@@ -7702,7 +7702,7 @@ static const struct net_device_ops s2io_netdev_ops = { ...@@ -7702,7 +7702,7 @@ static const struct net_device_ops s2io_netdev_ops = {
* returns 0 on success and negative on failure. * returns 0 on success and negative on failure.
*/ */
static int __devinit static int
s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
{ {
struct s2io_nic *sp; struct s2io_nic *sp;
...@@ -8200,7 +8200,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) ...@@ -8200,7 +8200,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
* from memory. * from memory.
*/ */
static void __devexit s2io_rem_nic(struct pci_dev *pdev) static void s2io_rem_nic(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct s2io_nic *sp; struct s2io_nic *sp;
......
...@@ -1075,9 +1075,9 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order) ...@@ -1075,9 +1075,9 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
/* /*
* Prototype declaration. * Prototype declaration.
*/ */
static int __devinit s2io_init_nic(struct pci_dev *pdev, static int s2io_init_nic(struct pci_dev *pdev,
const struct pci_device_id *pre); const struct pci_device_id *pre);
static void __devexit s2io_rem_nic(struct pci_dev *pdev); static void s2io_rem_nic(struct pci_dev *pdev);
static int init_shared_mem(struct s2io_nic *sp); static int init_shared_mem(struct s2io_nic *sp);
static void free_shared_mem(struct s2io_nic *sp); static void free_shared_mem(struct s2io_nic *sp);
static int init_nic(struct s2io_nic *nic); static int init_nic(struct s2io_nic *nic);
......
...@@ -993,7 +993,7 @@ __vxge_hw_vpath_addr_get(struct __vxge_hw_virtualpath *vpath, ...@@ -993,7 +993,7 @@ __vxge_hw_vpath_addr_get(struct __vxge_hw_virtualpath *vpath,
* for the driver, FW version information, and the first mac address for * for the driver, FW version information, and the first mac address for
* each vpath * each vpath
*/ */
enum vxge_hw_status __devinit enum vxge_hw_status
vxge_hw_device_hw_info_get(void __iomem *bar0, vxge_hw_device_hw_info_get(void __iomem *bar0,
struct vxge_hw_device_hw_info *hw_info) struct vxge_hw_device_hw_info *hw_info)
{ {
...@@ -1310,7 +1310,7 @@ __vxge_hw_device_config_check(struct vxge_hw_device_config *new_config) ...@@ -1310,7 +1310,7 @@ __vxge_hw_device_config_check(struct vxge_hw_device_config *new_config)
* When done, the driver allocates sizeof(struct __vxge_hw_device) bytes for HW * When done, the driver allocates sizeof(struct __vxge_hw_device) bytes for HW
* to enable the latter to perform Titan hardware initialization. * to enable the latter to perform Titan hardware initialization.
*/ */
enum vxge_hw_status __devinit enum vxge_hw_status
vxge_hw_device_initialize( vxge_hw_device_initialize(
struct __vxge_hw_device **devh, struct __vxge_hw_device **devh,
struct vxge_hw_device_attr *attr, struct vxge_hw_device_attr *attr,
...@@ -2917,7 +2917,7 @@ __vxge_hw_ring_create(struct __vxge_hw_vpath_handle *vp, ...@@ -2917,7 +2917,7 @@ __vxge_hw_ring_create(struct __vxge_hw_vpath_handle *vp,
* vxge_hw_device_config_default_get - Initialize device config with defaults. * vxge_hw_device_config_default_get - Initialize device config with defaults.
* Initialize Titan device config with default values. * Initialize Titan device config with default values.
*/ */
enum vxge_hw_status __devinit enum vxge_hw_status
vxge_hw_device_config_default_get(struct vxge_hw_device_config *device_config) vxge_hw_device_config_default_get(struct vxge_hw_device_config *device_config)
{ {
u32 i; u32 i;
......
...@@ -1846,11 +1846,11 @@ struct vxge_hw_vpath_attr { ...@@ -1846,11 +1846,11 @@ struct vxge_hw_vpath_attr {
struct vxge_hw_fifo_attr fifo_attr; struct vxge_hw_fifo_attr fifo_attr;
}; };
enum vxge_hw_status __devinit vxge_hw_device_hw_info_get( enum vxge_hw_status vxge_hw_device_hw_info_get(
void __iomem *bar0, void __iomem *bar0,
struct vxge_hw_device_hw_info *hw_info); struct vxge_hw_device_hw_info *hw_info);
enum vxge_hw_status __devinit vxge_hw_device_config_default_get( enum vxge_hw_status vxge_hw_device_config_default_get(
struct vxge_hw_device_config *device_config); struct vxge_hw_device_config *device_config);
/** /**
...@@ -1877,7 +1877,7 @@ u16 vxge_hw_device_link_width_get(struct __vxge_hw_device *devh); ...@@ -1877,7 +1877,7 @@ u16 vxge_hw_device_link_width_get(struct __vxge_hw_device *devh);
const u8 * const u8 *
vxge_hw_device_product_name_get(struct __vxge_hw_device *devh); vxge_hw_device_product_name_get(struct __vxge_hw_device *devh);
enum vxge_hw_status __devinit vxge_hw_device_initialize( enum vxge_hw_status vxge_hw_device_initialize(
struct __vxge_hw_device **devh, struct __vxge_hw_device **devh,
struct vxge_hw_device_attr *attr, struct vxge_hw_device_attr *attr,
struct vxge_hw_device_config *device_config); struct vxge_hw_device_config *device_config);
......
...@@ -3371,7 +3371,7 @@ static const struct net_device_ops vxge_netdev_ops = { ...@@ -3371,7 +3371,7 @@ static const struct net_device_ops vxge_netdev_ops = {
#endif #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, struct vxge_config *config,
int high_dma, int no_of_vpath, int high_dma, int no_of_vpath,
struct vxgedev **vdev_out) struct vxgedev **vdev_out)
...@@ -3672,7 +3672,7 @@ static void verify_bandwidth(void) ...@@ -3672,7 +3672,7 @@ static void verify_bandwidth(void)
/* /*
* Vpath configuration * Vpath configuration
*/ */
static int __devinit vxge_config_vpaths( static int vxge_config_vpaths(
struct vxge_hw_device_config *device_config, struct vxge_hw_device_config *device_config,
u64 vpath_mask, struct vxge_config *config_param) u64 vpath_mask, struct vxge_config *config_param)
{ {
...@@ -3859,7 +3859,7 @@ static int __devinit vxge_config_vpaths( ...@@ -3859,7 +3859,7 @@ static int __devinit vxge_config_vpaths(
} }
/* initialize device configuratrions */ /* initialize device configuratrions */
static void __devinit vxge_device_config_init( static void vxge_device_config_init(
struct vxge_hw_device_config *device_config, struct vxge_hw_device_config *device_config,
int *intr_type) int *intr_type)
{ {
...@@ -3912,7 +3912,7 @@ static void __devinit vxge_device_config_init( ...@@ -3912,7 +3912,7 @@ static void __devinit vxge_device_config_init(
device_config->rth_it_type); 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; int i;
...@@ -4269,7 +4269,7 @@ static int vxge_probe_fw_update(struct vxgedev *vdev) ...@@ -4269,7 +4269,7 @@ static int vxge_probe_fw_update(struct vxgedev *vdev)
return ret; return ret;
} }
static int __devinit is_sriov_initialized(struct pci_dev *pdev) static int is_sriov_initialized(struct pci_dev *pdev)
{ {
int pos; int pos;
u16 ctrl; u16 ctrl;
...@@ -4300,7 +4300,7 @@ static const struct vxge_hw_uld_cbs vxge_callbacks = { ...@@ -4300,7 +4300,7 @@ static const struct vxge_hw_uld_cbs vxge_callbacks = {
* returns 0 on success and negative on failure. * 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) vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
{ {
struct __vxge_hw_device *hldev; struct __vxge_hw_device *hldev;
...@@ -4764,7 +4764,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) ...@@ -4764,7 +4764,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
* Description: This function is called by the Pci subsystem to release a * Description: This function is called by the Pci subsystem to release a
* PCI device and free up all resource held up by the device. * 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 __vxge_hw_device *hldev;
struct vxgedev *vdev; struct vxgedev *vdev;
...@@ -4809,7 +4809,7 @@ static struct pci_driver vxge_driver = { ...@@ -4809,7 +4809,7 @@ static struct pci_driver vxge_driver = {
.name = VXGE_DRIVER_NAME, .name = VXGE_DRIVER_NAME,
.id_table = vxge_id_table, .id_table = vxge_id_table,
.probe = vxge_probe, .probe = vxge_probe,
.remove = __devexit_p(vxge_remove), .remove = vxge_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = vxge_pm_suspend, .suspend = vxge_pm_suspend,
.resume = vxge_pm_resume, .resume = vxge_pm_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment