diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-02-04 15:26:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-02-06 14:23:52 -0500 |
commit | 5aa57f0a655276f62683c0cc714cd6328d98e08a (patch) | |
tree | df06afdc9f598c3da0671a296d2319191e46be2b /drivers/power/lp8788-charger.c | |
parent | 860c9c54272deaab43b40dbe416becb34abd344f (diff) |
iio: Update iio_channel_get API to use consumer device pointer as argument
For iio_channel_get to work with OF based configurations, it needs the
consumer device pointer instead of the consumer device name as argument.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Anton Vorontsov <anton@enomsg.org>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/power/lp8788-charger.c')
-rw-r--r-- | drivers/power/lp8788-charger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c index 22b6407c9ca9..27889088e78e 100644 --- a/drivers/power/lp8788-charger.c +++ b/drivers/power/lp8788-charger.c | |||
@@ -580,7 +580,7 @@ static void lp8788_irq_unregister(struct platform_device *pdev, | |||
580 | } | 580 | } |
581 | } | 581 | } |
582 | 582 | ||
583 | static void lp8788_setup_adc_channel(const char *consumer_name, | 583 | static void lp8788_setup_adc_channel(struct device *dev, |
584 | struct lp8788_charger *pchg) | 584 | struct lp8788_charger *pchg) |
585 | { | 585 | { |
586 | struct lp8788_charger_platform_data *pdata = pchg->pdata; | 586 | struct lp8788_charger_platform_data *pdata = pchg->pdata; |
@@ -590,11 +590,11 @@ static void lp8788_setup_adc_channel(const char *consumer_name, | |||
590 | return; | 590 | return; |
591 | 591 | ||
592 | /* ADC channel for battery voltage */ | 592 | /* ADC channel for battery voltage */ |
593 | chan = iio_channel_get(consumer_name, pdata->adc_vbatt); | 593 | chan = iio_channel_get(dev, pdata->adc_vbatt); |
594 | pchg->chan[LP8788_VBATT] = IS_ERR(chan) ? NULL : chan; | 594 | pchg->chan[LP8788_VBATT] = IS_ERR(chan) ? NULL : chan; |
595 | 595 | ||
596 | /* ADC channel for battery temperature */ | 596 | /* ADC channel for battery temperature */ |
597 | chan = iio_channel_get(consumer_name, pdata->adc_batt_temp); | 597 | chan = iio_channel_get(dev, pdata->adc_batt_temp); |
598 | pchg->chan[LP8788_BATT_TEMP] = IS_ERR(chan) ? NULL : chan; | 598 | pchg->chan[LP8788_BATT_TEMP] = IS_ERR(chan) ? NULL : chan; |
599 | } | 599 | } |
600 | 600 | ||
@@ -704,7 +704,7 @@ static int lp8788_charger_probe(struct platform_device *pdev) | |||
704 | if (ret) | 704 | if (ret) |
705 | return ret; | 705 | return ret; |
706 | 706 | ||
707 | lp8788_setup_adc_channel(pdev->name, pchg); | 707 | lp8788_setup_adc_channel(&pdev->dev, pchg); |
708 | 708 | ||
709 | ret = lp8788_psy_register(pdev, pchg); | 709 | ret = lp8788_psy_register(pdev, pchg); |
710 | if (ret) | 710 | if (ret) |