Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eaec821 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.9-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull workqueue [delayed_]work_pending() cleanups from Tejun Heo:
 "This is part of on-going cleanups to remove / minimize usages of
  workqueue interfaces which are deprecated and/or misleading.

  This round drops a number of usages of [delayed_]work_pending(), which
  are dangerous as they lack any form of synchronization and thus often
  lead to buggy / unnecessary code.  There are a couple legitimate use
  cases in kernel.  Hopefully, they can be converted and
  [delayed_]work_pending() can be removed completely.  Even if not,
  removing most of misuses should make it more difficult to find
  examples of misuses and thus slow down growth of them.

  These changes are independent from other workqueue changes."

* 'for-3.9-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  wimax/i2400m: fix i2400m->wake_tx_skb handling
  kprobes: fix wait_for_kprobe_optimizer()
  ipw2x00: simplify scan_event handling
  video/exynos: don't use [delayed_]work_pending()
  tty/max3100: don't use [delayed_]work_pending()
  x86/mce: don't use [delayed_]work_pending()
  rfkill: don't use [delayed_]work_pending()
  wl1251: don't use [delayed_]work_pending()
  thinkpad_acpi: don't use [delayed_]work_pending()
  mwifiex: don't use [delayed_]work_pending()
  sja1000: don't use [delayed_]work_pending()
parents 1a13c0b1 23663c87

arch/x86/kernel/cpu/mcheck/mce.c

+3 −11
Original line number Diff line number Diff line
@@ -512,11 +512,8 @@ int mce_available(struct cpuinfo_x86 *c) 


static void mce_schedule_work(void)

{

	if (!mce_ring_empty()) {

		struct work_struct *work = &__get_cpu_var(mce_work);

		if (!work_pending(work))

			schedule_work(work);

	}

	if (!mce_ring_empty())

		schedule_work(&__get_cpu_var(mce_work));

}



DEFINE_PER_CPU(struct irq_work, mce_irq_work);
@@ -1351,12 +1348,7 @@ int mce_notify_irq(void) 
		/* wake processes polling /dev/mcelog */

		wake_up_interruptible(&mce_chrdev_wait);



		/*

		 * There is no risk of missing notifications because

		 * work_pending is always cleared before the function is

		 * executed.

		 */

		if (mce_helper[0] && !work_pending(&mce_trigger_work))

		if (mce_helper[0])

			schedule_work(&mce_trigger_work);



		if (__ratelimit(&ratelimit))

drivers/net/can/sja1000/peak_pci.c

+1 −2
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ 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);

}

drivers/net/wimax/i2400m/netdev.c

+17 −14
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void i2400m_wake_tx_work(struct work_struct *ws) 
	struct i2400m *i2400m = container_of(ws, struct i2400m, wake_tx_ws);

	struct net_device *net_dev = i2400m->wimax_dev.net_dev;

	struct device *dev = i2400m_dev(i2400m);

	struct sk_buff *skb = i2400m->wake_tx_skb;

	struct sk_buff *skb;

	unsigned long flags;



	spin_lock_irqsave(&i2400m->tx_lock, flags);
@@ -236,23 +236,26 @@ void i2400m_tx_prep_header(struct sk_buff *skb) 
void i2400m_net_wake_stop(struct i2400m *i2400m)

{

	struct device *dev = i2400m_dev(i2400m);

	struct sk_buff *wake_tx_skb;

	unsigned long flags;



	d_fnstart(3, dev, "(i2400m %p)\n", i2400m);

	/* See i2400m_hard_start_xmit(), references are taken there

	 * and here we release them if the work was still

	 * pending. Note we can't differentiate work not pending vs

	 * never scheduled, so the NULL check does that. */

	if (cancel_work_sync(&i2400m->wake_tx_ws) == 0

	    && i2400m->wake_tx_skb != NULL) {

		unsigned long flags;

		struct sk_buff *wake_tx_skb;

	/*

	 * See i2400m_hard_start_xmit(), references are taken there and

	 * here we release them if the packet was still pending.

	 */

	cancel_work_sync(&i2400m->wake_tx_ws);



	spin_lock_irqsave(&i2400m->tx_lock, flags);

		wake_tx_skb = i2400m->wake_tx_skb;	/* compat help */

		i2400m->wake_tx_skb = NULL;	/* compat help */

	wake_tx_skb = i2400m->wake_tx_skb;

	i2400m->wake_tx_skb = NULL;

	spin_unlock_irqrestore(&i2400m->tx_lock, flags);



	if (wake_tx_skb) {

		i2400m_put(i2400m);

		kfree_skb(wake_tx_skb);

	}



	d_fnend(3, dev, "(i2400m %p) = void\n", i2400m);

}
@@ -288,7 +291,7 @@ int i2400m_net_wake_tx(struct i2400m *i2400m, struct net_device *net_dev, 
	 * and if pending, release those resources. */

	result = 0;

	spin_lock_irqsave(&i2400m->tx_lock, flags);

	if (!work_pending(&i2400m->wake_tx_ws)) {

	if (!i2400m->wake_tx_skb) {

		netif_stop_queue(net_dev);

		i2400m_get(i2400m);

		i2400m->wake_tx_skb = skb_get(skb);	/* transfer ref count */

drivers/net/wireless/ipw2x00/ipw2100.c

+8 −23
Original line number Diff line number Diff line
@@ -2181,9 +2181,10 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status) 
	mod_delayed_work(system_wq, &priv->rf_kill, round_jiffies_relative(HZ));

}



static void send_scan_event(void *data)

static void ipw2100_scan_event(struct work_struct *work)

{

	struct ipw2100_priv *priv = data;

	struct ipw2100_priv *priv = container_of(work, struct ipw2100_priv,

						 scan_event.work);

	union iwreq_data wrqu;



	wrqu.data.length = 0;
@@ -2191,18 +2192,6 @@ static void send_scan_event(void *data) 
	wireless_send_event(priv->net_dev, SIOCGIWSCAN, &wrqu, NULL);

}



static void ipw2100_scan_event_later(struct work_struct *work)

{

	send_scan_event(container_of(work, struct ipw2100_priv,

					scan_event_later.work));

}



static void ipw2100_scan_event_now(struct work_struct *work)

{

	send_scan_event(container_of(work, struct ipw2100_priv,

					scan_event_now));

}



static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)

{

	IPW_DEBUG_SCAN("scan complete\n");
@@ -2212,13 +2201,11 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status) 


	/* Only userspace-requested scan completion events go out immediately */

	if (!priv->user_requested_scan) {

		if (!delayed_work_pending(&priv->scan_event_later))

			schedule_delayed_work(&priv->scan_event_later,

		schedule_delayed_work(&priv->scan_event,

				      round_jiffies_relative(msecs_to_jiffies(4000)));

	} else {

		priv->user_requested_scan = 0;

		cancel_delayed_work(&priv->scan_event_later);

		schedule_work(&priv->scan_event_now);

		mod_delayed_work(system_wq, &priv->scan_event, 0);

	}

}
@@ -4459,8 +4446,7 @@ static void ipw2100_kill_works(struct ipw2100_priv *priv) 
	cancel_delayed_work_sync(&priv->wx_event_work);

	cancel_delayed_work_sync(&priv->hang_check);

	cancel_delayed_work_sync(&priv->rf_kill);

	cancel_work_sync(&priv->scan_event_now);

	cancel_delayed_work_sync(&priv->scan_event_later);

	cancel_delayed_work_sync(&priv->scan_event);

}



static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
@@ -6195,8 +6181,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, 
	INIT_DELAYED_WORK(&priv->wx_event_work, ipw2100_wx_event_work);

	INIT_DELAYED_WORK(&priv->hang_check, ipw2100_hang_check);

	INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill);

	INIT_WORK(&priv->scan_event_now, ipw2100_scan_event_now);

	INIT_DELAYED_WORK(&priv->scan_event_later, ipw2100_scan_event_later);

	INIT_DELAYED_WORK(&priv->scan_event, ipw2100_scan_event);



	tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))

		     ipw2100_irq_tasklet, (unsigned long)priv);

drivers/net/wireless/ipw2x00/ipw2100.h

+1 −2
Original line number Diff line number Diff line
@@ -577,8 +577,7 @@ struct ipw2100_priv { 
	struct delayed_work wx_event_work;

	struct delayed_work hang_check;

	struct delayed_work rf_kill;

	struct work_struct scan_event_now;

	struct delayed_work scan_event_later;

	struct delayed_work scan_event;



	int user_requested_scan;