[<prev] [next>] [day] [month] [year] [list]
Date: Wed, 12 Dec 2012 14:00:24 +0000
From: "Kim, Milo" <Milo.Kim@...com>
To: Bryan Wu <cooloney@...il.com>
CC: "linux-leds@...r.kernel.org" <linux-leds@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH 02/33] leds-lp55xx: cleanup deinit_device() in lp5521/5523
Device de-initialization code is moved to _deinit_device() at each driver.
This patch is a preceding step for lp55xx common driver architecture.
Signed-off-by: Milo(Woogyom) Kim <milo.kim@...com>
---
drivers/leds/leds-lp5521.c | 20 ++++++++++++--------
drivers/leds/leds-lp5523.c | 20 ++++++++++++--------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 6951d5d..d2b79b5 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -740,6 +740,16 @@ static int lp5521_init_device(struct lp5521_chip *chip)
return ret;
}
+static void lp5521_deinit_device(struct lp5521_chip *chip)
+{
+ struct lp5521_platform_data *pdata = chip->pdata;
+
+ if (pdata->enable)
+ pdata->enable(0);
+ if (pdata->release_resources)
+ pdata->release_resources();
+}
+
static int __devinit lp5521_init_led(struct lp5521_led *led,
struct i2c_client *client,
int chan, struct lp5521_platform_data *pdata)
@@ -865,10 +875,7 @@ fail2:
cancel_work_sync(&chip->leds[i].brightness_work);
}
fail1:
- if (pdata->enable)
- pdata->enable(0);
- if (pdata->release_resources)
- pdata->release_resources();
+ lp5521_deinit_device(chip);
return ret;
}
@@ -885,10 +892,7 @@ static int __devexit lp5521_remove(struct i2c_client *client)
cancel_work_sync(&chip->leds[i].brightness_work);
}
- if (chip->pdata->enable)
- chip->pdata->enable(0);
- if (chip->pdata->release_resources)
- chip->pdata->release_resources();
+ lp5521_deinit_device(chip);
return 0;
}
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index 918f09d..b88251d 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -923,6 +923,16 @@ static int lp5523_init_device(struct lp5523_chip *chip)
return lp5523_detect(client);
}
+static void lp5523_deinit_device(struct lp5523_chip *chip)
+{
+ struct lp5523_platform_data *pdata = chip->pdata;
+
+ if (pdata->enable)
+ pdata->enable(0);
+ if (pdata->release_resources)
+ pdata->release_resources();
+}
+
static int __devinit lp5523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -1009,10 +1019,7 @@ fail2:
flush_work(&chip->leds[i].brightness_work);
}
fail1:
- if (pdata->enable)
- pdata->enable(0);
- if (pdata->release_resources)
- pdata->release_resources();
+ lp5523_deinit_device(chip);
return ret;
}
@@ -1031,10 +1038,7 @@ static int lp5523_remove(struct i2c_client *client)
flush_work(&chip->leds[i].brightness_work);
}
- if (chip->pdata->enable)
- chip->pdata->enable(0);
- if (chip->pdata->release_resources)
- chip->pdata->release_resources();
+ lp5523_deinit_device(chip);
return 0;
}
--
1.7.9.5
Best Regards,
Milo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists