evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ehea: kill unused ehea_rereg_mr_task

Browse source 
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
This commit is contained in:
Tejun Heo 2010-12-12 16:45:14 +01:00
parent 23f333a2bf
commit 3d6b892bcc
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/ehea/ehea.h
View file

@ -515,6 +515,4 @@ void ehea_set_ethtool_ops(struct net_device *netdev);
int ehea_sense_port_attr(struct ehea_port *port); int ehea_sense_port_attr(struct ehea_port *port);
int ehea_set_portspeed(struct ehea_port *port, u32 port_speed); int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);
extern struct work_struct ehea_rereg_mr_task;
#endif /* __EHEA_H__ */ #endif /* __EHEA_H__ */

9
drivers/net/ehea/ehea_main.c
View file

@ -101,7 +101,6 @@ MODULE_PARM_DESC(use_lro, " Large Receive Offload, 1: enable, 0: disable, "
static int port_name_cnt; static int port_name_cnt;
static LIST_HEAD(adapter_list); static LIST_HEAD(adapter_list);
static unsigned long ehea_driver_flags; static unsigned long ehea_driver_flags;
struct work_struct ehea_rereg_mr_task;
static DEFINE_MUTEX(dlpar_mem_lock); static DEFINE_MUTEX(dlpar_mem_lock);
struct ehea_fw_handle_array ehea_fw_handles; struct ehea_fw_handle_array ehea_fw_handles;
struct ehea_bcmc_reg_array ehea_bcmc_regs; struct ehea_bcmc_reg_array ehea_bcmc_regs;
@ -2984,7 +2983,7 @@ out:
mutex_unlock(&dlpar_mem_lock); mutex_unlock(&dlpar_mem_lock);
} }
static void ehea_rereg_mrs(struct work_struct *work) static void ehea_rereg_mrs(void)
{ {
int ret, i; int ret, i;
struct ehea_adapter *adapter; struct ehea_adapter *adapter;
@ -3659,14 +3658,14 @@ static int ehea_mem_notifier(struct notifier_block *nb,
set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages)) if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages))
goto out_unlock; goto out_unlock;
ehea_rereg_mrs(NULL); ehea_rereg_mrs();
break; break;
case MEM_GOING_OFFLINE: case MEM_GOING_OFFLINE:
ehea_info("memory is going offline"); ehea_info("memory is going offline");
set_bit(__EHEA_STOP_XFER, &ehea_driver_flags); set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages)) if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages))
goto out_unlock; goto out_unlock;
ehea_rereg_mrs(NULL); ehea_rereg_mrs();
break; break;
default: default:
break; break;
@ -3742,8 +3741,6 @@ int __init ehea_module_init(void)
printk(KERN_INFO "IBM eHEA ethernet device driver (Release %s)\n", printk(KERN_INFO "IBM eHEA ethernet device driver (Release %s)\n",
DRV_VERSION); DRV_VERSION);
INIT_WORK(&ehea_rereg_mr_task, ehea_rereg_mrs);
memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles)); memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles));
memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs)); memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs));