Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / hwmon / jz4740-hwmon.c

diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
index 0621ee1b3c98f1ebb9a86fb316fb8d0690a6e9e1..2d40a2e771d75db582e4eed9d497b47c5a4e9ab2 100644 (file)
--- a/drivers/hwmon/jz4740-hwmon.c
+++ b/drivers/hwmon/jz4740-hwmon.c
@@ -44,8 +44,8 @@ static irqreturn_t jz4740_hwmon_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static ssize_t jz4740_hwmon_read_adcin(struct device *dev,
-       struct device_attribute *dev_attr, char *buf)
+static ssize_t in0_input_show(struct device *dev,
+                             struct device_attribute *dev_attr, char *buf)
 {
        struct jz4740_hwmon *hwmon = dev_get_drvdata(dev);
        struct platform_device *pdev = hwmon->pdev;
@@ -79,7 +79,7 @@ static ssize_t jz4740_hwmon_read_adcin(struct device *dev,
        return ret;
 }
 
-static DEVICE_ATTR(in0_input, S_IRUGO, jz4740_hwmon_read_adcin, NULL);
+static DEVICE_ATTR_RO(in0_input);
 
 static struct attribute *jz4740_attrs[] = {
        &dev_attr_in0_input.attr,