Skip to content

Commit

Permalink
hwmon: Convert mc13783-adc to mc13xxx API
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Uwe Kleine-König authored and Samuel Ortiz committed Oct 24, 2011
1 parent 8aece6a commit 613c27a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/hwmon/mc13783-adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define MC13783_ADC_NAME "mc13783-adc"

struct mc13783_adc_priv {
struct mc13783 *mc13783;
struct mc13xxx *mc13xxx;
struct device *hwmon_dev;
};

Expand All @@ -51,8 +51,8 @@ static int mc13783_adc_read(struct device *dev,
unsigned int sample[4];
int ret;

ret = mc13783_adc_do_conversion(priv->mc13783,
MC13783_ADC_MODE_MULT_CHAN,
ret = mc13xxx_adc_do_conversion(priv->mc13xxx,
MC13XXX_ADC_MODE_MULT_CHAN,
channel, sample);
if (ret)
return ret;
Expand Down Expand Up @@ -147,9 +147,9 @@ static const struct attribute_group mc13783_group_ts = {
static int mc13783_adc_use_touchscreen(struct platform_device *pdev)
{
struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
unsigned flags = mc13783_get_flags(priv->mc13783);
unsigned flags = mc13xxx_get_flags(priv->mc13xxx);

return flags & MC13783_USE_TOUCHSCREEN;
return flags & MC13XXX_USE_TOUCHSCREEN;
}

static int __init mc13783_adc_probe(struct platform_device *pdev)
Expand All @@ -161,7 +161,7 @@ static int __init mc13783_adc_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;

priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);

platform_set_drvdata(pdev, priv);

Expand Down

0 comments on commit 613c27a

Please sign in to comment.