projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[cascardo/linux.git]
/
drivers
/
hwmon
/
mc13783-adc.c
diff --git
a/drivers/hwmon/mc13783-adc.c
b/drivers/hwmon/mc13783-adc.c
index
d5226c9
..
ef65ab5
100644
(file)
--- a/
drivers/hwmon/mc13783-adc.c
+++ b/
drivers/hwmon/mc13783-adc.c
@@
-31,7
+31,7
@@
#define MC13783_ADC_NAME "mc13783-adc"
struct mc13783_adc_priv {
#define MC13783_ADC_NAME "mc13783-adc"
struct mc13783_adc_priv {
- struct mc13
783 *mc13783
;
+ struct mc13
xxx *mc13xxx
;
struct device *hwmon_dev;
};
struct device *hwmon_dev;
};
@@
-51,8
+51,8
@@
static int mc13783_adc_read(struct device *dev,
unsigned int sample[4];
int ret;
unsigned int sample[4];
int ret;
- ret = mc13
783_adc_do_conversion(priv->mc13783
,
- MC13
783
_ADC_MODE_MULT_CHAN,
+ ret = mc13
xxx_adc_do_conversion(priv->mc13xxx
,
+ MC13
XXX
_ADC_MODE_MULT_CHAN,
channel, sample);
if (ret)
return ret;
channel, sample);
if (ret)
return ret;
@@
-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);
static int mc13783_adc_use_touchscreen(struct platform_device *pdev)
{
struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
- unsigned flags = mc13
783_get_flags(priv->mc13783
);
+ unsigned flags = mc13
xxx_get_flags(priv->mc13xxx
);
- return flags & MC13
783
_USE_TOUCHSCREEN;
+ return flags & MC13
XXX
_USE_TOUCHSCREEN;
}
static int __init mc13783_adc_probe(struct platform_device *pdev)
}
static int __init mc13783_adc_probe(struct platform_device *pdev)
@@
-161,7
+161,7
@@
static int __init mc13783_adc_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
if (!priv)
return -ENOMEM;
- priv->mc13
783
= dev_get_drvdata(pdev->dev.parent);
+ priv->mc13
xxx
= dev_get_drvdata(pdev->dev.parent);
platform_set_drvdata(pdev, priv);
platform_set_drvdata(pdev, priv);