diff options
| author | Daniel Willerud <daniel.willerud@stericsson.com> | 2011-02-16 09:42:28 +0100 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-02-18 16:11:04 +0100 |
| commit | f36976759e616659709e1486f5e99de8c48a6b06 (patch) | |
| tree | e520c40b7366d3b5503c06579f6ecca15e3ee701 /drivers/hwmon | |
| parent | 8ce7833a3ffc27194aee49b30746f47f7c95d3d3 (diff) | |
MFD: ab8500-gpadc: New ab8500_gpadc API
Added ab8500_gpadc_get() API, moved gpadc and calibration structs and
channel enums.
Clients utilizing the new API.
ST-Ericsson ID: ER281133
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com>
Change-Id: Ief442b47ed3315d62a8b887d49bf03f9b6502e3b
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16125
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/ab8500.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/hwmon/ab8500.c b/drivers/hwmon/ab8500.c index c6000fa42c0..809e870a840 100644 --- a/drivers/hwmon/ab8500.c +++ b/drivers/hwmon/ab8500.c @@ -37,7 +37,6 @@ #include <linux/workqueue.h> #include <linux/jiffies.h> #include <linux/mutex.h> -#include <linux/mfd/ab8500.h> #include <linux/mfd/ab8500/ab8500-gpadc.h> #include <linux/pm.h> @@ -56,7 +55,7 @@ struct ab8500_temp { struct platform_device *pdev; struct device *hwmon_dev; - struct ab8500 *ab8500; + struct ab8500_gpadc *gpadc; u8 gpadc_addr[NUM_SENSORS]; unsigned long min[NUM_SENSORS]; unsigned long max[NUM_SENSORS]; @@ -127,8 +126,7 @@ static void gpadc_monitor(struct work_struct *work) && data->min[i] == 0) continue; - val = ab8500_gpadc_convert(data->ab8500->gpadc, - data->gpadc_addr[i]); + val = ab8500_gpadc_convert(data->gpadc, data->gpadc_addr[i]); if (val < 0) { dev_err(&data->pdev->dev, "GPADC read failed\n"); continue; @@ -338,7 +336,7 @@ static ssize_t show_input(struct device *dev, /* hwmon attr index starts at 1, thus "attr->index-1" below */ u8 gpadc_addr = data->gpadc_addr[attr->index - 1]; - val = ab8500_gpadc_convert(data->ab8500->gpadc, gpadc_addr); + val = ab8500_gpadc_convert(data->gpadc, gpadc_addr); if (val < 0) dev_err(&data->pdev->dev, "GPADC read failed\n"); @@ -621,12 +619,7 @@ static int __devinit ab8500_temp_probe(struct platform_device *pdev) if (err < 0) goto exit; - if (pdev->dev.parent != NULL) - data->ab8500 = dev_get_drvdata(pdev->dev.parent); - else { - dev_err(&pdev->dev, "GPADC not present in AB8500 device\n"); - goto exit; - } + data->gpadc = ab8500_gpadc_get(); data->hwmon_dev = hwmon_device_register(&pdev->dev); if (IS_ERR(data->hwmon_dev)) { |