From: Tejun Heo <tj@kernel.org>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
davem@davemloft.net
Cc: Tejun Heo <tj@kernel.org>, Breno Leitao <leitao@linux.vnet.ibm.com>
Subject: [PATCH 3/9] ehea: kill unused ehea_rereg_mr_task
Date: Sun, 12 Dec 2010 16:52:59 +0100 [thread overview]
Message-ID: <1292169185-10579-4-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1292169185-10579-1-git-send-email-tj@kernel.org>
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
---
drivers/net/ehea/ehea.h | 2 --
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 8e745e7..1f2a675 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);
int ehea_sense_port_attr(struct ehea_port *port);
int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);
-extern struct work_struct ehea_rereg_mr_task;
-
#endif /* __EHEA_H__ */
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 69f6152..d51def1 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, "
static int port_name_cnt;
static LIST_HEAD(adapter_list);
static unsigned long ehea_driver_flags;
-struct work_struct ehea_rereg_mr_task;
static DEFINE_MUTEX(dlpar_mem_lock);
struct ehea_fw_handle_array ehea_fw_handles;
struct ehea_bcmc_reg_array ehea_bcmc_regs;
@@ -2984,7 +2983,7 @@ out:
mutex_unlock(&dlpar_mem_lock);
}
-static void ehea_rereg_mrs(struct work_struct *work)
+static void ehea_rereg_mrs(void)
{
int ret, i;
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);
if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages))
goto out_unlock;
- ehea_rereg_mrs(NULL);
+ ehea_rereg_mrs();
break;
case MEM_GOING_OFFLINE:
ehea_info("memory is going offline");
set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages))
goto out_unlock;
- ehea_rereg_mrs(NULL);
+ ehea_rereg_mrs();
break;
default:
break;
@@ -3742,8 +3741,6 @@ int __init ehea_module_init(void)
printk(KERN_INFO "IBM eHEA ethernet device driver (Release %s)\n",
DRV_VERSION);
-
- INIT_WORK(&ehea_rereg_mr_task, ehea_rereg_mrs);
memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles));
memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs));
--
1.7.1
next prev parent reply other threads:[~2010-12-12 15:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-12 15:52 [PATCHSET] net-dev: don't use flush_scheduled_work() Tejun Heo
2010-12-12 15:52 ` [PATCH 1/9] drivers/net: remove unnecessary flush_scheduled_work() calls Tejun Heo
2010-12-15 0:54 ` Jon Mason
2010-12-12 15:52 ` [PATCH 2/9] drivers/net: don't use flush_scheduled_work() Tejun Heo
2010-12-13 11:22 ` Lennert Buytenhek
2010-12-13 17:08 ` Michael Chan
2010-12-13 21:27 ` Andrew Gallatin
2010-12-12 15:52 ` Tejun Heo [this message]
2010-12-12 15:53 ` [PATCH 4/9] ehea: " Tejun Heo
2010-12-12 15:53 ` [PATCH 5/9] iseries_veth: " Tejun Heo
2010-12-12 15:53 ` [PATCH 6/9] igb[v],ixgbe: " Tejun Heo
2010-12-12 15:53 ` [PATCH 7/9] sungem: update gp->reset_task flushing Tejun Heo
2010-12-12 15:53 ` [PATCH 8/9] i2400m: drop i2400m_schedule_work() Tejun Heo
2010-12-12 15:53 ` [PATCH 9/9] hostap: don't use flush_scheduled_work() Tejun Heo
2010-12-12 22:38 ` [PATCHSET] net-dev: " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292169185-10579-4-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc=davem@davemloft.net \
--cc=leitao@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.