Merge branch 'pm-wakeirq' (3fc7aeeb) · Commits · e / devices / android_kernel_teracube_2e

drivers/base/power/wakeirq.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -45,14 +45,12 @@ static int dev_pm_attach_wake_irq(struct device *dev, int irq,
		return -EEXIST;
		}

		err = device_wakeup_attach_irq(dev, wirq);
		if (!err)
		dev->power.wakeirq = wirq;
		spin_unlock_irqrestore(&dev->power.lock, flags);

		err = device_wakeup_attach_irq(dev, wirq);
		if (err)
		spin_unlock_irqrestore(&dev->power.lock, flags);
		return err;

		return 0;
		}

		/**
		@@ -105,10 +103,10 @@ void dev_pm_clear_wake_irq(struct device *dev)
		return;

		spin_lock_irqsave(&dev->power.lock, flags);
		device_wakeup_detach_irq(dev);
		dev->power.wakeirq = NULL;
		spin_unlock_irqrestore(&dev->power.lock, flags);

		device_wakeup_detach_irq(dev);
		if (wirq->dedicated_irq)
		free_irq(wirq->irq, wirq);
		kfree(wirq);

+10 −21

Original line number	Diff line number	Diff line
		@@ -281,32 +281,25 @@ EXPORT_SYMBOL_GPL(device_wakeup_enable);
		* Attach a device wakeirq to the wakeup source so the device
		* wake IRQ can be configured automatically for suspend and
		* resume.
		*
		* Call under the device's power.lock lock.
		*/
		int device_wakeup_attach_irq(struct device *dev,
		struct wake_irq *wakeirq)
		{
		struct wakeup_source *ws;
		int ret = 0;

		spin_lock_irq(&dev->power.lock);
		ws = dev->power.wakeup;
		if (!ws) {
		dev_err(dev, "forgot to call call device_init_wakeup?\n");
		ret = -EINVAL;
		goto unlock;
		return -EINVAL;
		}

		if (ws->wakeirq) {
		ret = -EEXIST;
		goto unlock;
		}
		if (ws->wakeirq)
		return -EEXIST;

		ws->wakeirq = wakeirq;

		unlock:
		spin_unlock_irq(&dev->power.lock);

		return ret;
		return 0;
		}

		/**
		@@ -314,20 +307,16 @@ int device_wakeup_attach_irq(struct device *dev,
		* @dev: Device to handle
		*
		* Removes a device wakeirq from the wakeup source.
		*
		* Call under the device's power.lock lock.
		*/
		void device_wakeup_detach_irq(struct device *dev)
		{
		struct wakeup_source *ws;

		spin_lock_irq(&dev->power.lock);
		ws = dev->power.wakeup;
		if (!ws)
		goto unlock;

		if (ws)
		ws->wakeirq = NULL;

		unlock:
		spin_unlock_irq(&dev->power.lock);
		}

		/**