| Message ID | 1356141435-17340-4-git-send-email-tj@kernel.org |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tejun Heo <tj@kernel.org> Date: Fri, 21 Dec 2012 17:56:53 -0800 > There's no need to test whether a (delayed) work item in pending > before queueing, flushing or cancelling it. Most uses are unnecessary > and quite a few of them are buggy. > > Remove unnecessary pending tests from sja1000. Only compile tested. > > Signed-off-by: Tejun Heo <tj@kernel.org> > Cc: Wolfgang Grandegger <wg@grandegger.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: netdev@vger.kernel.org > --- > Please let me know how this patch should be routed. I can take it > through the workqueue tree if necessary. I would suggest just taking it via the workqueue tree, thanks Tejun. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Dec 22, 2012 at 12:01:11AM -0800, David Miller wrote: > From: Tejun Heo <tj@kernel.org> > Date: Fri, 21 Dec 2012 17:56:53 -0800 > > > There's no need to test whether a (delayed) work item in pending > > before queueing, flushing or cancelling it. Most uses are unnecessary > > and quite a few of them are buggy. > > > > Remove unnecessary pending tests from sja1000. Only compile tested. > > > > Signed-off-by: Tejun Heo <tj@kernel.org> > > Cc: Wolfgang Grandegger <wg@grandegger.com> > > Cc: "David S. Miller" <davem@davemloft.net> > > Cc: netdev@vger.kernel.org > > --- > > Please let me know how this patch should be routed. I can take it > > through the workqueue tree if necessary. > > I would suggest just taking it via the workqueue tree, thanks Tejun. Applied to wq/for-3.9-cleanups w/ your Acked-by added. Thanks.
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index d84888f..600ac72 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c @@ -339,8 +339,7 @@ static void peak_pciec_set_leds(struct peak_pciec_card *card, u8 led_mask, u8 s) */ static void peak_pciec_start_led_work(struct peak_pciec_card *card) { - if (!delayed_work_pending(&card->led_work)) - schedule_delayed_work(&card->led_work, HZ); + schedule_delayed_work(&card->led_work, HZ); } /*
There's no need to test whether a (delayed) work item in pending before queueing, flushing or cancelling it. Most uses are unnecessary and quite a few of them are buggy. Remove unnecessary pending tests from sja1000. Only compile tested. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Wolfgang Grandegger <wg@grandegger.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org --- Please let me know how this patch should be routed. I can take it through the workqueue tree if necessary. Thanks. drivers/net/can/sja1000/peak_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)