diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-08-24 09:28:24 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-24 08:09:12 -0400 |
commit | 613c27ab98dd2242bd9d62b0ab00b440bdf3259f (patch) | |
tree | 3564ea66cb42a0247537216a349f1e8e41ebdd94 /drivers/hwmon/mc13783-adc.c | |
parent | 8aece6ab49dbc5646d6339eee424d1f944f54519 (diff) |
hwmon: Convert mc13783-adc to mc13xxx API
The mc13783_... functions are going to be removed, so switch to the
more generic API.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/hwmon/mc13783-adc.c')
-rw-r--r-- | drivers/hwmon/mc13783-adc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13783-adc.c index d5226c9e1201..ef65ab56b094 100644 --- a/drivers/hwmon/mc13783-adc.c +++ b/drivers/hwmon/mc13783-adc.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #define MC13783_ADC_NAME "mc13783-adc" | 31 | #define MC13783_ADC_NAME "mc13783-adc" |
32 | 32 | ||
33 | struct mc13783_adc_priv { | 33 | struct mc13783_adc_priv { |
34 | struct mc13783 *mc13783; | 34 | struct mc13xxx *mc13xxx; |
35 | struct device *hwmon_dev; | 35 | struct device *hwmon_dev; |
36 | }; | 36 | }; |
37 | 37 | ||
@@ -51,8 +51,8 @@ static int mc13783_adc_read(struct device *dev, | |||
51 | unsigned int sample[4]; | 51 | unsigned int sample[4]; |
52 | int ret; | 52 | int ret; |
53 | 53 | ||
54 | ret = mc13783_adc_do_conversion(priv->mc13783, | 54 | ret = mc13xxx_adc_do_conversion(priv->mc13xxx, |
55 | MC13783_ADC_MODE_MULT_CHAN, | 55 | MC13XXX_ADC_MODE_MULT_CHAN, |
56 | channel, sample); | 56 | channel, sample); |
57 | if (ret) | 57 | if (ret) |
58 | return ret; | 58 | return ret; |
@@ -147,9 +147,9 @@ static const struct attribute_group mc13783_group_ts = { | |||
147 | static int mc13783_adc_use_touchscreen(struct platform_device *pdev) | 147 | static int mc13783_adc_use_touchscreen(struct platform_device *pdev) |
148 | { | 148 | { |
149 | struct mc13783_adc_priv *priv = platform_get_drvdata(pdev); | 149 | struct mc13783_adc_priv *priv = platform_get_drvdata(pdev); |
150 | unsigned flags = mc13783_get_flags(priv->mc13783); | 150 | unsigned flags = mc13xxx_get_flags(priv->mc13xxx); |
151 | 151 | ||
152 | return flags & MC13783_USE_TOUCHSCREEN; | 152 | return flags & MC13XXX_USE_TOUCHSCREEN; |
153 | } | 153 | } |
154 | 154 | ||
155 | static int __init mc13783_adc_probe(struct platform_device *pdev) | 155 | static int __init mc13783_adc_probe(struct platform_device *pdev) |
@@ -161,7 +161,7 @@ static int __init mc13783_adc_probe(struct platform_device *pdev) | |||
161 | if (!priv) | 161 | if (!priv) |
162 | return -ENOMEM; | 162 | return -ENOMEM; |
163 | 163 | ||
164 | priv->mc13783 = dev_get_drvdata(pdev->dev.parent); | 164 | priv->mc13xxx = dev_get_drvdata(pdev->dev.parent); |
165 | 165 | ||
166 | platform_set_drvdata(pdev, priv); | 166 | platform_set_drvdata(pdev, priv); |
167 | 167 | ||