Merge "leds: aw2013_led: use PM suspend/resume for aw2013_led" (a2231e77) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/leds/leds-aw2013.c

+5 −69

Original line number	Diff line number	Diff line
		@@ -22,11 +22,6 @@
		#include <linux/regulator/consumer.h>
		#include <linux/leds-aw2013.h>

		#if defined(CONFIG_FB)
		#include <linux/notifier.h>
		#include <linux/fb.h>
		#endif

		/* register address */
		#define AW_REG_RESET 0x00
		#define AW_REG_GLOBAL_CONTROL 0x01
		@@ -64,9 +59,6 @@ struct aw2013_led {
		struct mutex lock;
		struct regulator *vdd;
		struct regulator *vcc;
		#if defined(CONFIG_FB)
		struct notifier_block fb_notif;
		#endif
		int num_leds;
		int id;
		bool suspended;
		@@ -435,74 +427,24 @@ static int aw2013_led_resume(struct device *dev)
		mutex_unlock(&led->lock);
		return ret;
		}
		#else
		static int aw2013_led_suspend(struct device *dev)
		{
		return 0;
		}

		static int aw2013_led_resume(struct device *dev)
		{
		return 0;
		}
		#endif

		#if (defined(CONFIG_PM) && !defined(CONFIG_FB))
		static const struct dev_pm_ops aw2013_led_pm_ops = {
		.suspend = aw2013_led_suspend,
		.resume = aw2013_led_resume,
		};
		#else
		static const struct dev_pm_ops aw2013_led_pm_ops = {
		};
		#endif

		/*
		* If CONFIG_FB is defined, LEDs suspend/resume are triggered by framebuffer.
		* If the screen is off, LEDs go to suspend; if screen is on, LEDs go to
		* resume; based on user space definition, LEDs may blink when suspend, and
		* may be off when resume.
		*/
		#if defined(CONFIG_FB)
		static int fb_notifier_callback(struct notifier_block *self,
		unsigned long event, void *data)
		static int aw2013_led_suspend(struct device *dev)
		{
		struct fb_event *evdata = data;
		int *blank;
		struct aw2013_led *led = container_of(self,
		struct aw2013_led, fb_notif);

		if (evdata && evdata->data && event == FB_EVENT_BLANK &&
		led && led->client) {
		blank = evdata->data;
		if (*blank == FB_BLANK_UNBLANK)
		aw2013_led_resume(&led->client->dev);
		else if (*blank == FB_BLANK_POWERDOWN)
		aw2013_led_suspend(&led->client->dev);
		}

		return 0;
		}

		static int aw2013_set_suspend_callback(struct aw2013_led *led_array)
		{
		int ret;

		led_array->fb_notif.notifier_call = fb_notifier_callback;

		ret = fb_register_client(&led_array->fb_notif);

		if (ret)
		dev_err(&led_array->client->dev,
		"Unable to register fb_notifier: %d\n",
		ret);
		return ret;
		}
		#else
		static int aw2013_set_suspend_callback(struct aw2013_led *led_array)
		static int aw2013_led_resume(struct device *dev)
		{
		return 0;
		}

		static const struct dev_pm_ops aw2013_led_pm_ops = {
		};
		#endif

		static int aw2013_led_err_handle(struct aw2013_led *led_array,
		@@ -706,12 +648,6 @@ static int aw2013_led_probe(struct i2c_client *client,
		goto pwr_deinit;
		}

		ret = aw2013_set_suspend_callback(led_array);
		if (ret) {
		dev_err(&client->dev, "set suspend callback failed");
		goto pwr_deinit;
		}

		return 0;

		pwr_deinit: