diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-12 10:45:14 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-12 10:45:14 -0500 |
commit | 3d6b892bcc4c810071e36d8aff25aa171f55f93d (patch) | |
tree | fafea61c3d40d0bca6ecd3a3ffd48376362d4b03 /drivers/net/ehea | |
parent | 23f333a2bfafba80339315b724808982a9de57d9 (diff) |
ehea: kill unused ehea_rereg_mr_task
ehea_rereg_mr_task is not used. Remove it and drop @work parameter
from ehea_rereg_mrs().
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Breno Leitao <leitao@linux.vnet.ibm.com>
Cc: netdev@vger.kernel.org
Diffstat (limited to 'drivers/net/ehea')
-rw-r--r-- | drivers/net/ehea/ehea.h | 2 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 8e745e74828d..1f2a675649b7 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -515,6 +515,4 @@ void ehea_set_ethtool_ops(struct net_device *netdev); | |||
515 | int ehea_sense_port_attr(struct ehea_port *port); | 515 | int ehea_sense_port_attr(struct ehea_port *port); |
516 | int ehea_set_portspeed(struct ehea_port *port, u32 port_speed); | 516 | int ehea_set_portspeed(struct ehea_port *port, u32 port_speed); |
517 | 517 | ||
518 | extern struct work_struct ehea_rereg_mr_task; | ||
519 | |||
520 | #endif /* __EHEA_H__ */ | 518 | #endif /* __EHEA_H__ */ |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 69f61523fcc8..d51def112d35 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -101,7 +101,6 @@ MODULE_PARM_DESC(use_lro, " Large Receive Offload, 1: enable, 0: disable, " | |||
101 | static int port_name_cnt; | 101 | static int port_name_cnt; |
102 | static LIST_HEAD(adapter_list); | 102 | static LIST_HEAD(adapter_list); |
103 | static unsigned long ehea_driver_flags; | 103 | static unsigned long ehea_driver_flags; |
104 | struct work_struct ehea_rereg_mr_task; | ||
105 | static DEFINE_MUTEX(dlpar_mem_lock); | 104 | static DEFINE_MUTEX(dlpar_mem_lock); |
106 | struct ehea_fw_handle_array ehea_fw_handles; | 105 | struct ehea_fw_handle_array ehea_fw_handles; |
107 | struct ehea_bcmc_reg_array ehea_bcmc_regs; | 106 | struct ehea_bcmc_reg_array ehea_bcmc_regs; |
@@ -2984,7 +2983,7 @@ out: | |||
2984 | mutex_unlock(&dlpar_mem_lock); | 2983 | mutex_unlock(&dlpar_mem_lock); |
2985 | } | 2984 | } |
2986 | 2985 | ||
2987 | static void ehea_rereg_mrs(struct work_struct *work) | 2986 | static void ehea_rereg_mrs(void) |
2988 | { | 2987 | { |
2989 | int ret, i; | 2988 | int ret, i; |
2990 | struct ehea_adapter *adapter; | 2989 | struct ehea_adapter *adapter; |
@@ -3659,14 +3658,14 @@ static int ehea_mem_notifier(struct notifier_block *nb, | |||
3659 | set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); | 3658 | set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); |
3660 | if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages)) | 3659 | if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages)) |
3661 | goto out_unlock; | 3660 | goto out_unlock; |
3662 | ehea_rereg_mrs(NULL); | 3661 | ehea_rereg_mrs(); |
3663 | break; | 3662 | break; |
3664 | case MEM_GOING_OFFLINE: | 3663 | case MEM_GOING_OFFLINE: |
3665 | ehea_info("memory is going offline"); | 3664 | ehea_info("memory is going offline"); |
3666 | set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); | 3665 | set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); |
3667 | if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages)) | 3666 | if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages)) |
3668 | goto out_unlock; | 3667 | goto out_unlock; |
3669 | ehea_rereg_mrs(NULL); | 3668 | ehea_rereg_mrs(); |
3670 | break; | 3669 | break; |
3671 | default: | 3670 | default: |
3672 | break; | 3671 | break; |
@@ -3742,8 +3741,6 @@ int __init ehea_module_init(void) | |||
3742 | printk(KERN_INFO "IBM eHEA ethernet device driver (Release %s)\n", | 3741 | printk(KERN_INFO "IBM eHEA ethernet device driver (Release %s)\n", |
3743 | DRV_VERSION); | 3742 | DRV_VERSION); |
3744 | 3743 | ||
3745 | |||
3746 | INIT_WORK(&ehea_rereg_mr_task, ehea_rereg_mrs); | ||
3747 | memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles)); | 3744 | memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles)); |
3748 | memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs)); | 3745 | memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs)); |
3749 | 3746 | ||