diff options
author | Milo(Woogyom) Kim <milo.kim@ti.com> | 2013-02-05 03:50:36 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2013-02-06 18:59:26 -0500 |
commit | 1a9914855d2868112257dbc5771ddc6ebc9b2cab (patch) | |
tree | d0b2079655a0e75f30e1e89eea816cd87fbf10ee /drivers/leds | |
parent | 944f7b1dedb859f76a88c8d34ce23a90bf6285a0 (diff) |
leds-lp55xx: clean up 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@ti.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds')
-rw-r--r-- | drivers/leds/leds-lp5521.c | 20 | ||||
-rw-r--r-- | 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 24f439f78bd8..fd963fe0a944 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) | |||
740 | return ret; | 740 | return ret; |
741 | } | 741 | } |
742 | 742 | ||
743 | static void lp5521_deinit_device(struct lp5521_chip *chip) | ||
744 | { | ||
745 | struct lp5521_platform_data *pdata = chip->pdata; | ||
746 | |||
747 | if (pdata->enable) | ||
748 | pdata->enable(0); | ||
749 | if (pdata->release_resources) | ||
750 | pdata->release_resources(); | ||
751 | } | ||
752 | |||
743 | static int lp5521_init_led(struct lp5521_led *led, | 753 | static int lp5521_init_led(struct lp5521_led *led, |
744 | struct i2c_client *client, | 754 | struct i2c_client *client, |
745 | int chan, struct lp5521_platform_data *pdata) | 755 | int chan, struct lp5521_platform_data *pdata) |
@@ -865,10 +875,7 @@ fail2: | |||
865 | cancel_work_sync(&chip->leds[i].brightness_work); | 875 | cancel_work_sync(&chip->leds[i].brightness_work); |
866 | } | 876 | } |
867 | fail1: | 877 | fail1: |
868 | if (pdata->enable) | 878 | lp5521_deinit_device(chip); |
869 | pdata->enable(0); | ||
870 | if (pdata->release_resources) | ||
871 | pdata->release_resources(); | ||
872 | return ret; | 879 | return ret; |
873 | } | 880 | } |
874 | 881 | ||
@@ -885,10 +892,7 @@ static int lp5521_remove(struct i2c_client *client) | |||
885 | cancel_work_sync(&chip->leds[i].brightness_work); | 892 | cancel_work_sync(&chip->leds[i].brightness_work); |
886 | } | 893 | } |
887 | 894 | ||
888 | if (chip->pdata->enable) | 895 | lp5521_deinit_device(chip); |
889 | chip->pdata->enable(0); | ||
890 | if (chip->pdata->release_resources) | ||
891 | chip->pdata->release_resources(); | ||
892 | return 0; | 896 | return 0; |
893 | } | 897 | } |
894 | 898 | ||
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index 491ea725bb0b..ddb482aebe14 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) | |||
923 | return lp5523_detect(client); | 923 | return lp5523_detect(client); |
924 | } | 924 | } |
925 | 925 | ||
926 | static void lp5523_deinit_device(struct lp5523_chip *chip) | ||
927 | { | ||
928 | struct lp5523_platform_data *pdata = chip->pdata; | ||
929 | |||
930 | if (pdata->enable) | ||
931 | pdata->enable(0); | ||
932 | if (pdata->release_resources) | ||
933 | pdata->release_resources(); | ||
934 | } | ||
935 | |||
926 | static int lp5523_probe(struct i2c_client *client, | 936 | static int lp5523_probe(struct i2c_client *client, |
927 | const struct i2c_device_id *id) | 937 | const struct i2c_device_id *id) |
928 | { | 938 | { |
@@ -1009,10 +1019,7 @@ fail2: | |||
1009 | flush_work(&chip->leds[i].brightness_work); | 1019 | flush_work(&chip->leds[i].brightness_work); |
1010 | } | 1020 | } |
1011 | fail1: | 1021 | fail1: |
1012 | if (pdata->enable) | 1022 | lp5523_deinit_device(chip); |
1013 | pdata->enable(0); | ||
1014 | if (pdata->release_resources) | ||
1015 | pdata->release_resources(); | ||
1016 | return ret; | 1023 | return ret; |
1017 | } | 1024 | } |
1018 | 1025 | ||
@@ -1031,10 +1038,7 @@ static int lp5523_remove(struct i2c_client *client) | |||
1031 | flush_work(&chip->leds[i].brightness_work); | 1038 | flush_work(&chip->leds[i].brightness_work); |
1032 | } | 1039 | } |
1033 | 1040 | ||
1034 | if (chip->pdata->enable) | 1041 | lp5523_deinit_device(chip); |
1035 | chip->pdata->enable(0); | ||
1036 | if (chip->pdata->release_resources) | ||
1037 | chip->pdata->release_resources(); | ||
1038 | return 0; | 1042 | return 0; |
1039 | } | 1043 | } |
1040 | 1044 | ||