git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock
[pandora-kernel.git]
/
drivers
/
hwmon
/
ad7314.c
diff --git
a/drivers/hwmon/ad7314.c
b/drivers/hwmon/ad7314.c
index
318e38e
..
08e2947
100644
(file)
--- a/
drivers/hwmon/ad7314.c
+++ b/
drivers/hwmon/ad7314.c
@@
-96,10
+96,18
@@
static ssize_t ad7314_show_temperature(struct device *dev,
}
}
}
}
+static ssize_t ad7314_show_name(struct device *dev,
+ struct device_attribute *devattr, char *buf)
+{
+ return sprintf(buf, "%s\n", to_spi_device(dev)->modalias);
+}
+
+static DEVICE_ATTR(name, S_IRUGO, ad7314_show_name, NULL);
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
ad7314_show_temperature, NULL, 0);
static struct attribute *ad7314_attributes[] = {
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
ad7314_show_temperature, NULL, 0);
static struct attribute *ad7314_attributes[] = {
+ &dev_attr_name.attr,
&sensor_dev_attr_temp1_input.dev_attr.attr,
NULL,
};
&sensor_dev_attr_temp1_input.dev_attr.attr,
NULL,
};
@@
-160,7
+168,6
@@
MODULE_DEVICE_TABLE(spi, ad7314_id);
static struct spi_driver ad7314_driver = {
.driver = {
.name = "ad7314",
static struct spi_driver ad7314_driver = {
.driver = {
.name = "ad7314",
- .bus = &spi_bus_type,
.owner = THIS_MODULE,
},
.probe = ad7314_probe,
.owner = THIS_MODULE,
},
.probe = ad7314_probe,