Driver core changes for 2.6.12
Subsystems (57)
PATCH 1/1 Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc.c: update device attribute callbacks
In reply to Greg KH[PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc.c: update device attribute callbacks
Signed-off-by Yani Ioannou <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 10523b3b82456e416cbaffcc24ea2246980aa746
tree fab3ac16bffb04cc25683e83a583b1cae3f0d450
parent 3fd3c0a5f53a0f9d8987b90acbd84f7dd8ef606e
author Yani Ioannou <[email protected]> Tue, 17 May 2005 06:43:37 -0400 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:35 -0700
drivers/s390/net/qeth_sys.c | 126 +++++++++++++++--------------- drivers/s390/scsi/zfcp_scsi.c | 2 drivers/s390/scsi/zfcp_sysfs_adapter.c | 10 +- drivers/s390/scsi/zfcp_sysfs_port.c | 10 +- drivers/s390/scsi/zfcp_sysfs_unit.c | 6 + drivers/scsi/53c700.c | 2 drivers/scsi/arm/eesox.c | 4 - drivers/scsi/arm/powertec.c | 4 - drivers/scsi/ipr.c | 2 drivers/scsi/megaraid/megaraid_mbox.c | 4 - drivers/scsi/scsi_sysfs.c | 28 +++---- drivers/sh/superhyway/superhyway-sysfs.c | 2 drivers/usb/core/sysfs.c | 24 +++--- drivers/usb/gadget/dummy_hcd.c | 4 - drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/net2280.c | 6 + drivers/usb/gadget/pxa2xx_udc.c | 2 17 files changed, 122 insertions(+), 122 deletions(-)
drivers/s390/net/qeth_sys.c +63 -63
@@ -30,7 +30,7 @@ const char *VERSION_QETH_SYS_C = "$Revis//low/high watermark static ssize_t -qeth_dev_state_show (struct device *dev,char *buf) +qeth_dev_state_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;if (!card)
@@ -58,7 +58,7 @@ qeth_dev_state_show(struct device *dev, static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL);static ssize_t -qeth_dev_chpid_show (struct device *dev,char *buf) +qeth_dev_chpid_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;if (!card)
@@ -70,7 +70,7 @@ qeth_dev_chpid_show(struct device *dev, static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL);static ssize_t -qeth_dev_if_name_show (struct device *dev,char *buf) +qeth_dev_if_name_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;if (!card)
@@ -81,7 +81,7 @@ qeth_dev_if_name_show(struct device *dev static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);static ssize_t -qeth_dev_card_type_show (struct device *dev,char *buf) +qeth_dev_card_type_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;if (!card)
@@ -93,7 +93,7 @@ qeth_dev_card_type_show(struct device *d static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);static ssize_t -qeth_dev_portno_show (struct device *dev,char *buf) +qeth_dev_portno_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;if (!card)
@@ -103,7 +103,7 @@ qeth_dev_portno_show(struct device *dev, }static ssize_t -qeth_dev_portno_store (struct device *dev,const char *buf,size_t count) +qeth_dev_portno_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -129,7 +129,7 @@ qeth_dev_portno_store(struct device *dev static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store);static ssize_t -qeth_dev_portname_show (struct device *dev,char *buf) +qeth_dev_portname_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;char portname[9 ] = {0 , };
@@ -146,7 +146,7 @@ qeth_dev_portname_show(struct device *de }static ssize_t -qeth_dev_portname_store (struct device *dev,const char *buf,size_t count) +qeth_dev_portname_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -177,7 +177,7 @@ static DEVICE_ATTR(portname, 0644, qeth_ qeth_dev_portname_store);static ssize_t -qeth_dev_checksum_show (struct device *dev,char *buf) +qeth_dev_checksum_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -188,7 +188,7 @@ qeth_dev_checksum_show(struct device *de }static ssize_t -qeth_dev_checksum_store (struct device *dev,const char *buf,size_t count) +qeth_dev_checksum_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -218,7 +218,7 @@ static DEVICE_ATTR(checksumming, 0644, q qeth_dev_checksum_store);static ssize_t -qeth_dev_prioqing_show (struct device *dev,char *buf) +qeth_dev_prioqing_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -237,7 +237,7 @@ qeth_dev_prioqing_show(struct device *de }static ssize_t -qeth_dev_prioqing_store (struct device *dev,const char *buf,size_t count) +qeth_dev_prioqing_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -290,7 +290,7 @@ static DEVICE_ATTR(priority_queueing, 06 qeth_dev_prioqing_store);static ssize_t -qeth_dev_bufcnt_show (struct device *dev,char *buf) +qeth_dev_bufcnt_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -301,7 +301,7 @@ qeth_dev_bufcnt_show(struct device *dev, }static ssize_t -qeth_dev_bufcnt_store (struct device *dev,const char *buf,size_t count) +qeth_dev_bufcnt_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -360,7 +360,7 @@ qeth_dev_route_show(struct qeth_card *ca }static ssize_t -qeth_dev_route4_show (struct device *dev,char *buf) +qeth_dev_route4_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -410,7 +410,7 @@ qeth_dev_route_store(struct qeth_card *c }static ssize_t -qeth_dev_route4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_route4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -425,7 +425,7 @@ static DEVICE_ATTR(route4, 0644, qeth_de#ifdef CONFIG_QETH_IPV6 static ssize_t -qeth_dev_route6_show (struct device *dev,char *buf) +qeth_dev_route6_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -439,7 +439,7 @@ qeth_dev_route6_show(struct device *dev, }static ssize_t -qeth_dev_route6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_route6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -461,7 +461,7 @@ static DEVICE_ATTR(route6, 0644, qeth_de#endif static ssize_t -qeth_dev_add_hhlen_show (struct device *dev,char *buf) +qeth_dev_add_hhlen_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -472,7 +472,7 @@ qeth_dev_add_hhlen_show(struct device *d }static ssize_t -qeth_dev_add_hhlen_store (struct device *dev,const char *buf,size_t count) +qeth_dev_add_hhlen_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -499,7 +499,7 @@ static DEVICE_ATTR(add_hhlen, 0644, qeth qeth_dev_add_hhlen_store);static ssize_t -qeth_dev_fake_ll_show (struct device *dev,char *buf) +qeth_dev_fake_ll_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -510,7 +510,7 @@ qeth_dev_fake_ll_show(struct device *dev }static ssize_t -qeth_dev_fake_ll_store (struct device *dev,const char *buf,size_t count) +qeth_dev_fake_ll_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -536,7 +536,7 @@ static DEVICE_ATTR(fake_ll, 0644, qeth_d qeth_dev_fake_ll_store);static ssize_t -qeth_dev_fake_broadcast_show (struct device *dev,char *buf) +qeth_dev_fake_broadcast_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -547,7 +547,7 @@ qeth_dev_fake_broadcast_show(struct devi }static ssize_t -qeth_dev_fake_broadcast_store (struct device *dev,const char *buf,size_t count) +qeth_dev_fake_broadcast_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -574,7 +574,7 @@ static DEVICE_ATTR(fake_broadcast, 0644, qeth_dev_fake_broadcast_store);static ssize_t -qeth_dev_recover_store (struct device *dev,const char *buf,size_t count) +qeth_dev_recover_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -596,7 +596,7 @@ qeth_dev_recover_store(struct device *de static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);static ssize_t -qeth_dev_broadcast_mode_show (struct device *dev,char *buf) +qeth_dev_broadcast_mode_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -613,7 +613,7 @@ qeth_dev_broadcast_mode_show(struct devi }static ssize_t -qeth_dev_broadcast_mode_store (struct device *dev,const char *buf,size_t count) +qeth_dev_broadcast_mode_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -651,7 +651,7 @@ static DEVICE_ATTR(broadcast_mode, 0644, qeth_dev_broadcast_mode_store);static ssize_t -qeth_dev_canonical_macaddr_show (struct device *dev,char *buf) +qeth_dev_canonical_macaddr_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -667,7 +667,7 @@ qeth_dev_canonical_macaddr_show(struct d }static ssize_t -qeth_dev_canonical_macaddr_store (struct device *dev,const char *buf, +qeth_dev_canonical_macaddr_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -703,7 +703,7 @@ static DEVICE_ATTR(canonical_macaddr, 06 qeth_dev_canonical_macaddr_store);static ssize_t -qeth_dev_layer2_show (struct device *dev,char *buf) +qeth_dev_layer2_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -714,7 +714,7 @@ qeth_dev_layer2_show(struct device *dev, }static ssize_t -qeth_dev_layer2_store (struct device *dev,const char *buf,size_t count) +qeth_dev_layer2_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -742,7 +742,7 @@ static DEVICE_ATTR(layer2, 0644, qeth_de qeth_dev_layer2_store);static ssize_t -qeth_dev_large_send_show (struct device *dev,char *buf) +qeth_dev_large_send_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -762,7 +762,7 @@ qeth_dev_large_send_show(struct device * }static ssize_t -qeth_dev_large_send_store (struct device *dev,const char *buf,size_t count) +qeth_dev_large_send_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;enum qeth_large_send_types type;
@@ -832,7 +832,7 @@ qeth_dev_blkt_store(struct qeth_card *ca }static ssize_t -qeth_dev_blkt_total_show (struct device *dev,char *buf) +qeth_dev_blkt_total_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -841,7 +841,7 @@ qeth_dev_blkt_total_show(struct device *static ssize_t -qeth_dev_blkt_total_store (struct device *dev,const char *buf,size_t count) +qeth_dev_blkt_total_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -855,7 +855,7 @@ static DEVICE_ATTR(total, 0644, qeth_dev qeth_dev_blkt_total_store);static ssize_t -qeth_dev_blkt_inter_show (struct device *dev,char *buf) +qeth_dev_blkt_inter_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -864,7 +864,7 @@ qeth_dev_blkt_inter_show(struct device *static ssize_t -qeth_dev_blkt_inter_store (struct device *dev,const char *buf,size_t count) +qeth_dev_blkt_inter_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -876,7 +876,7 @@ static DEVICE_ATTR(inter, 0644, qeth_dev qeth_dev_blkt_inter_store);static ssize_t -qeth_dev_blkt_inter_jumbo_show (struct device *dev,char *buf) +qeth_dev_blkt_inter_jumbo_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -886,7 +886,7 @@ qeth_dev_blkt_inter_jumbo_show(struct destatic ssize_t -qeth_dev_blkt_inter_jumbo_store (struct device *dev,const char *buf,size_t count) +qeth_dev_blkt_inter_jumbo_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -956,7 +956,7 @@ qeth_check_layer2(struct qeth_card *cardstatic ssize_t -qeth_dev_ipato_enable_show (struct device *dev,char *buf) +qeth_dev_ipato_enable_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -969,7 +969,7 @@ qeth_dev_ipato_enable_show(struct device }static ssize_t -qeth_dev_ipato_enable_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_enable_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -1004,7 +1004,7 @@ static QETH_DEVICE_ATTR(ipato_enable, en qeth_dev_ipato_enable_store);static ssize_t -qeth_dev_ipato_invert4_show (struct device *dev,char *buf) +qeth_dev_ipato_invert4_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1018,7 +1018,7 @@ qeth_dev_ipato_invert4_show(struct devic }static ssize_t -qeth_dev_ipato_invert4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_invert4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -1084,7 +1084,7 @@ qeth_dev_ipato_add_show(char *buf, struc }static ssize_t -qeth_dev_ipato_add4_show (struct device *dev,char *buf) +qeth_dev_ipato_add4_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1153,7 +1153,7 @@ qeth_dev_ipato_add_store(const char *buf }static ssize_t -qeth_dev_ipato_add4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_add4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1186,7 +1186,7 @@ qeth_dev_ipato_del_store(const char *buf }static ssize_t -qeth_dev_ipato_del4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_del4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1201,7 +1201,7 @@ static QETH_DEVICE_ATTR(ipato_del4, del4#ifdef CONFIG_QETH_IPV6 static ssize_t -qeth_dev_ipato_invert6_show (struct device *dev,char *buf) +qeth_dev_ipato_invert6_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1215,7 +1215,7 @@ qeth_dev_ipato_invert6_show(struct devic }static ssize_t -qeth_dev_ipato_invert6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_invert6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;char *tmp;
@@ -1247,7 +1247,7 @@ static QETH_DEVICE_ATTR(ipato_invert6, istatic ssize_t -qeth_dev_ipato_add6_show (struct device *dev,char *buf) +qeth_dev_ipato_add6_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1258,7 +1258,7 @@ qeth_dev_ipato_add6_show(struct device * }static ssize_t -qeth_dev_ipato_add6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_add6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1273,7 +1273,7 @@ static QETH_DEVICE_ATTR(ipato_add6, add6 qeth_dev_ipato_add6_store);static ssize_t -qeth_dev_ipato_del6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_ipato_del6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1341,7 +1341,7 @@ qeth_dev_vipa_add_show(char *buf, struct }static ssize_t -qeth_dev_vipa_add4_show (struct device *dev,char *buf) +qeth_dev_vipa_add4_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1381,7 +1381,7 @@ qeth_dev_vipa_add_store(const char *buf, }static ssize_t -qeth_dev_vipa_add4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_vipa_add4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1413,7 +1413,7 @@ qeth_dev_vipa_del_store(const char *buf, }static ssize_t -qeth_dev_vipa_del4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_vipa_del4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1428,7 +1428,7 @@ static QETH_DEVICE_ATTR(vipa_del4, del4,#ifdef CONFIG_QETH_IPV6 static ssize_t -qeth_dev_vipa_add6_show (struct device *dev,char *buf) +qeth_dev_vipa_add6_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1439,7 +1439,7 @@ qeth_dev_vipa_add6_show(struct device *d }static ssize_t -qeth_dev_vipa_add6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_vipa_add6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1454,7 +1454,7 @@ static QETH_DEVICE_ATTR(vipa_add6, add6, qeth_dev_vipa_add6_store);static ssize_t -qeth_dev_vipa_del6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_vipa_del6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1522,7 +1522,7 @@ qeth_dev_rxip_add_show(char *buf, struct }static ssize_t -qeth_dev_rxip_add4_show (struct device *dev,char *buf) +qeth_dev_rxip_add4_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1562,7 +1562,7 @@ qeth_dev_rxip_add_store(const char *buf, }static ssize_t -qeth_dev_rxip_add4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_rxip_add4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1594,7 +1594,7 @@ qeth_dev_rxip_del_store(const char *buf, }static ssize_t -qeth_dev_rxip_del4_store (struct device *dev,const char *buf,size_t count) +qeth_dev_rxip_del4_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1609,7 +1609,7 @@ static QETH_DEVICE_ATTR(rxip_del4, del4,#ifdef CONFIG_QETH_IPV6 static ssize_t -qeth_dev_rxip_add6_show (struct device *dev,char *buf) +qeth_dev_rxip_add6_show (struct device *dev,struct device_attribute *attr,char *buf) {struct qeth_card *card = dev->driver_data;
@@ -1620,7 +1620,7 @@ qeth_dev_rxip_add6_show(struct device *d }static ssize_t -qeth_dev_rxip_add6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_rxip_add6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
@@ -1635,7 +1635,7 @@ static QETH_DEVICE_ATTR(rxip_add6, add6, qeth_dev_rxip_add6_store);static ssize_t -qeth_dev_rxip_del6_store (struct device *dev,const char *buf,size_t count) +qeth_dev_rxip_del6_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct qeth_card *card = dev->driver_data;
drivers/s390/scsi/zfcp_scsi.c +1 -1
@@ -924,7 +924,7 @@ struct fc_function_template zfcp_transpo* Generates attribute for a unit. */ #define ZFCP_DEFINE_SCSI_ATTR (_name, _format, _value) \ -static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, \ +static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct scsi_device *sdev; \
drivers/s390/scsi/zfcp_sysfs_adapter.c +5 -5
@@ -50,7 +50,7 @@ static const char fc_topologies[5][25] =* Generates attributes for an adapter. */ #define ZFCP_DEFINE_ADAPTER_ATTR (_name, _format, _value) \ -static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, \ +static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct zfcp_adapter *adapter; \
@@ -90,7 +90,7 @@ ZFCP_DEFINE_ADAPTER_ATTR(in_recovery, "%* Store function of the "port_add" attribute of an adapter. */ static ssize_t -zfcp_sysfs_port_add_store (struct device *dev,const char *buf,size_t count) +zfcp_sysfs_port_add_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {wwn_t wwpn;char *endp;
@@ -135,7 +135,7 @@ static DEVICE_ATTR(port_add, S_IWUSR, NU* Store function of the "port_remove" attribute of an adapter. */ static ssize_t -zfcp_sysfs_port_remove_store (struct device *dev,const char *buf,size_t count) +zfcp_sysfs_port_remove_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct zfcp_adapter *adapter;struct zfcp_port *port;
@@ -196,7 +196,7 @@ static DEVICE_ATTR(port_remove, S_IWUSR,* started for the belonging adapter. */ static ssize_t -zfcp_sysfs_adapter_failed_store (struct device *dev, +zfcp_sysfs_adapter_failed_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct zfcp_adapter *adapter;
@@ -236,7 +236,7 @@ zfcp_sysfs_adapter_failed_store(struct d* "0" if adapter is working, otherwise "1". */ static ssize_t -zfcp_sysfs_adapter_failed_show (struct device *dev,char *buf) +zfcp_sysfs_adapter_failed_show (struct device *dev,struct device_attribute *attr,char *buf) {struct zfcp_adapter *adapter;
drivers/s390/scsi/zfcp_sysfs_port.c +5 -5
@@ -53,7 +53,7 @@ zfcp_sysfs_port_release(struct device *d* Generates attributes for a port. */ #define ZFCP_DEFINE_PORT_ATTR (_name, _format, _value) \ -static ssize_t zfcp_sysfs_port_##_name##_show(struct device *dev, \ +static ssize_t zfcp_sysfs_port_##_name##_show(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct zfcp_port *port; \
@@ -82,7 +82,7 @@ ZFCP_DEFINE_PORT_ATTR(access_denied, "%d* Store function of the "unit_add" attribute of a port. */ static ssize_t -zfcp_sysfs_unit_add_store (struct device *dev,const char *buf,size_t count) +zfcp_sysfs_unit_add_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {fcp_lun_t fcp_lun;char *endp;
@@ -125,7 +125,7 @@ static DEVICE_ATTR(unit_add, S_IWUSR, NU* @count: number of bytes in buffer */ static ssize_t -zfcp_sysfs_unit_remove_store (struct device *dev,const char *buf,size_t count) +zfcp_sysfs_unit_remove_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct zfcp_port *port;struct zfcp_unit *unit;
@@ -186,7 +186,7 @@ static DEVICE_ATTR(unit_remove, S_IWUSR,* started for the belonging port. */ static ssize_t -zfcp_sysfs_port_failed_store (struct device *dev,const char *buf,size_t count) +zfcp_sysfs_port_failed_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct zfcp_port *port;unsigned int val;
@@ -224,7 +224,7 @@ zfcp_sysfs_port_failed_store(struct devi* "0" if port is working, otherwise "1". */ static ssize_t -zfcp_sysfs_port_failed_show (struct device *dev,char *buf) +zfcp_sysfs_port_failed_show (struct device *dev,struct device_attribute *attr,char *buf) {struct zfcp_port *port;
drivers/s390/scsi/zfcp_sysfs_unit.c +3 -3
@@ -53,7 +53,7 @@ zfcp_sysfs_unit_release(struct device *d* Generates attribute for a unit. */ #define ZFCP_DEFINE_UNIT_ATTR (_name, _format, _value) \ -static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev, \ +static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev, struct device_attribute *attr, \ char *buf) \ { \ struct zfcp_unit *unit; \
@@ -86,7 +86,7 @@ ZFCP_DEFINE_UNIT_ATTR(access_readonly, "* started for the belonging unit. */ static ssize_t -zfcp_sysfs_unit_failed_store (struct device *dev,const char *buf,size_t count) +zfcp_sysfs_unit_failed_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct zfcp_unit *unit;unsigned int val;
@@ -123,7 +123,7 @@ zfcp_sysfs_unit_failed_store(struct devi* "0" if unit is working, otherwise "1". */ static ssize_t -zfcp_sysfs_unit_failed_show (struct device *dev,char *buf) +zfcp_sysfs_unit_failed_show (struct device *dev,struct device_attribute *attr,char *buf) {struct zfcp_unit *unit;
drivers/scsi/53c700.c +1 -1
@@ -2125,7 +2125,7 @@ static int NCR_700_change_queue_type(str }static ssize_t -NCR_700_show_active_tags (struct device *dev,char *buf) +NCR_700_show_active_tags (struct device *dev,struct device_attribute *attr,char *buf) {struct scsi_device *SDp =to_scsi_device (dev);
drivers/scsi/arm/eesox.c +2 -2
@@ -466,7 +466,7 @@ int eesoxscsi_proc_info(struct Scsi_Hostreturn pos; } -static ssize_t eesoxscsi_show_term (struct device *dev,char *buf) +static ssize_t eesoxscsi_show_term (struct device *dev,struct device_attribute *attr,char *buf) {struct expansion_card *ec =ECARD_DEV (dev);struct Scsi_Host *host =ecard_get_drvdata (ec);
@@ -475,7 +475,7 @@ static ssize_t eesoxscsi_show_term(strucreturn sprintf (buf,"%d\n" , info->control &EESOX_TERM_ENABLE ?1 :0 ); } -static ssize_t eesoxscsi_store_term (struct device *dev,const char *buf,size_t len) +static ssize_t eesoxscsi_store_term (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {struct expansion_card *ec =ECARD_DEV (dev);struct Scsi_Host *host =ecard_get_drvdata (ec);
drivers/scsi/arm/powertec.c +2 -2
@@ -269,7 +269,7 @@ int powertecscsi_proc_info(struct Scsi_Hreturn pos; } -static ssize_t powertecscsi_show_term (struct device *dev,char *buf) +static ssize_t powertecscsi_show_term (struct device *dev,struct device_attribute *attr,char *buf) {struct expansion_card *ec =ECARD_DEV (dev);struct Scsi_Host *host =ecard_get_drvdata (ec);
@@ -279,7 +279,7 @@ static ssize_t powertecscsi_show_term(st }static ssize_t -powertecscsi_store_term (struct device *dev,const char *buf,size_t len) +powertecscsi_store_term (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {struct expansion_card *ec =ECARD_DEV (dev);struct Scsi_Host *host =ecard_get_drvdata (ec);
drivers/scsi/ipr.c +1 -1
@@ -2716,7 +2716,7 @@ static int ipr_change_queue_type(struct* Return value: * number of bytes printed to buffer **/ -static ssize_t ipr_show_adapter_handle (struct device *dev,char *buf) +static ssize_t ipr_show_adapter_handle (struct device *dev,struct device_attribute *attr,char *buf) {struct scsi_device *sdev =to_scsi_device (dev);struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
drivers/scsi/megaraid/megaraid_mbox.c +2 -2
@@ -124,7 +124,7 @@ static irqreturn_t megaraid_isr(int, voistatic void megaraid_mbox_dpc (unsigned long );static ssize_t megaraid_sysfs_show_app_hndl (struct class_device *,char *); -static ssize_t megaraid_sysfs_show_ldnum (struct device *,char *); +static ssize_t megaraid_sysfs_show_ldnum (struct device *,struct device_attribute *attr,char *);static int megaraid_cmm_register (adapter_t *);static int megaraid_cmm_unregister (adapter_t *);
@@ -4145,7 +4145,7 @@ megaraid_sysfs_show_app_hndl(struct clas* @param buf : buffer to send data to */ static ssize_t -megaraid_sysfs_show_ldnum (struct device *dev,char *buf) +megaraid_sysfs_show_ldnum (struct device *dev,struct device_attribute *attr,char *buf) {struct scsi_device *sdev =to_scsi_device (dev);adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP (sdev->host);
drivers/scsi/scsi_sysfs.c +14 -14
@@ -230,7 +230,7 @@ void scsi_sysfs_unregister(void)*/ #define sdev_show_function (field, format_string) \ static ssize_t \ -sdev_show_##field (struct device *dev, char *buf) \ +sdev_show_##field (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct scsi_device *sdev; \ sdev = to_scsi_device(dev); \
@@ -254,7 +254,7 @@ static DEVICE_ATTR(field, S_IRUGO, sdev_ sdev_show_function(field, format_string) \ \static ssize_t \ -sdev_store_##field (struct device *dev, const char *buf, size_t count) \ +sdev_store_##field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ { \struct scsi_device *sdev; \ sdev =to_scsi_device (dev); \
@@ -274,7 +274,7 @@ static DEVICE_ATTR(field, S_IRUGO | S_IW sdev_show_function(field, "%d\n") \ \static ssize_t \ -sdev_store_##field (struct device *dev, const char *buf, size_t count) \ +sdev_store_##field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ { \int ret; \struct scsi_device *sdev; \
@@ -317,7 +317,7 @@ sdev_rd_attr (model, "%.16s\n");sdev_rd_attr (rev,"%.4s\n" );static ssize_t -sdev_show_timeout (struct device *dev,char *buf) +sdev_show_timeout (struct device *dev,struct device_attribute *attr,char *buf) {struct scsi_device *sdev; sdev =to_scsi_device (dev);
@@ -325,7 +325,7 @@ sdev_show_timeout (struct device *dev, c }static ssize_t -sdev_store_timeout (struct device *dev,const char *buf,size_t count) +sdev_store_timeout (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct scsi_device *sdev;int timeout;
@@ -337,14 +337,14 @@ sdev_store_timeout (struct device *dev, static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout);static ssize_t -store_rescan_field (struct device *dev,const char *buf,size_t count) +store_rescan_field (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {scsi_rescan_device (dev);return count; } static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field); -static ssize_t sdev_store_delete (struct device *dev,const char *buf, +static ssize_t sdev_store_delete (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {scsi_remove_device (to_scsi_device (dev));
@@ -353,7 +353,7 @@ static ssize_t sdev_store_delete(struct static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);static ssize_t -store_state_field (struct device *dev,const char *buf,size_t count) +store_state_field (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {int i;struct scsi_device *sdev =to_scsi_device (dev);
@@ -376,7 +376,7 @@ store_state_field(struct device *dev, co }static ssize_t -show_state_field (struct device *dev,char *buf) +show_state_field (struct device *dev,struct device_attribute *attr,char *buf) {struct scsi_device *sdev =to_scsi_device (dev);const char *name =scsi_device_state_name (sdev->sdev_state);
@@ -390,7 +390,7 @@ show_state_field(struct device *dev, cha static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_state_field, store_state_field);static ssize_t -show_queue_type_field (struct device *dev,char *buf) +show_queue_type_field (struct device *dev,struct device_attribute *attr,char *buf) {struct scsi_device *sdev =to_scsi_device (dev);const char *name ="none" ;
@@ -406,7 +406,7 @@ show_queue_type_field(struct device *dev static DEVICE_ATTR(queue_type, S_IRUGO, show_queue_type_field, NULL);static ssize_t -show_iostat_counterbits (struct device *dev,char *buf) +show_iostat_counterbits (struct device *dev,struct device_attribute *attr,char *buf) {return snprintf (buf,20 ,"%d\n" , (int )sizeof (atomic_t) *8 ); }
@@ -415,7 +415,7 @@ static DEVICE_ATTR(iocounterbits, S_IRUG#define show_sdev_iostat (field) \ static ssize_t \ -show_iostat_##field(struct device *dev, char *buf) \ +show_iostat_##field(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct scsi_device *sdev = to_scsi_device(dev); \ unsigned long long count = atomic_read(&sdev->field); \
@@ -449,7 +449,7 @@ static struct device_attribute *scsi_sys NULL }; -static ssize_t sdev_store_queue_depth_rw (struct device *dev,const char *buf, +static ssize_t sdev_store_queue_depth_rw (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {int depth, retval;
@@ -475,7 +475,7 @@ static struct device_attribute sdev_attr__ATTR (queue_depth,S_IRUGO |S_IWUSR , sdev_show_queue_depth, sdev_store_queue_depth_rw); -static ssize_t sdev_store_queue_type_rw (struct device *dev,const char *buf, +static ssize_t sdev_store_queue_type_rw (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct scsi_device *sdev =to_scsi_device (dev);
drivers/sh/superhyway/superhyway-sysfs.c +1 -1
@@ -15,7 +15,7 @@#include <linux/superhyway.h> #define superhyway_ro_attr (name, fmt, field) \ -static ssize_t name##_show(struct device *dev, char *buf) \ +static ssize_t name##_show(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct superhyway_device *s = to_superhyway_device(dev); \ return sprintf(buf, fmt, s->field); \
drivers/usb/core/sysfs.c +12 -12
@@ -24,7 +24,7 @@/* Active configuration fields */ #define usb_actconfig_show (field, multiplier, format_string) \ -static ssize_t show_##field (struct device *dev, char *buf) \ +static ssize_t show_##field (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct usb_device *udev; \ struct usb_host_config *actconfig; \
@@ -46,7 +46,7 @@ usb_actconfig_attr (bNumInterfaces, 1, " usb_actconfig_attr (bmAttributes, 1, "%2x\n") usb_actconfig_attr (bMaxPower, 2, "%3dmA\n") -static ssize_t show_configuration_string (struct device *dev,char *buf) +static ssize_t show_configuration_string (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_device *udev;struct usb_host_config *actconfig;
@@ -69,7 +69,7 @@ static DEVICE_ATTR(configuration, S_IRUGusb_actconfig_show (bConfigurationValue,1 ,"%u\n" );static ssize_t -set_bConfigurationValue (struct device *dev,const char *buf,size_t count) +set_bConfigurationValue (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct usb_device *udev = udev =to_usb_device (dev);int config, value;
@@ -87,7 +87,7 @@ static DEVICE_ATTR(bConfigurationValue,/* String fields */ #define usb_string_attr (name) \ -static ssize_t show_##name(struct device *dev, char *buf) \ +static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct usb_device *udev; \ int len; \
@@ -107,7 +107,7 @@ usb_string_attr(manufacturer);usb_string_attr (serial);static ssize_t -show_speed (struct device *dev,char *buf) +show_speed (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_device *udev;char *speed;
@@ -133,7 +133,7 @@ show_speed (struct device *dev, char *bu static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL);static ssize_t -show_devnum (struct device *dev,char *buf) +show_devnum (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_device *udev;
@@ -143,7 +143,7 @@ show_devnum (struct device *dev, char *b static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);static ssize_t -show_version (struct device *dev,char *buf) +show_version (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_device *udev;u16 bcdUSB;
@@ -155,7 +155,7 @@ show_version (struct device *dev, char * static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);static ssize_t -show_maxchild (struct device *dev,char *buf) +show_maxchild (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_device *udev;
@@ -167,7 +167,7 @@ static DEVICE_ATTR(maxchild, S_IRUGO, sh/* Descriptor fields */ #define usb_descriptor_attr_le16 (field, format_string) \ static ssize_t \ -show_##field (struct device *dev, char *buf) \ +show_##field (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct usb_device *udev; \ \
@@ -183,7 +183,7 @@ usb_descriptor_attr_le16(bcdDevice, "%04#define usb_descriptor_attr (field, format_string) \ static ssize_t \ -show_##field (struct device *dev, char *buf) \ +show_##field (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct usb_device *udev; \ \
@@ -254,7 +254,7 @@ void usb_remove_sysfs_dev_files (struct/* Interface fields */ #define usb_intf_attr (field, format_string) \ static ssize_t \ -show_##field (struct device *dev, char *buf) \ +show_##field (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct usb_interface *intf = to_usb_interface (dev); \ \
@@ -269,7 +269,7 @@ usb_intf_attr (bInterfaceClass, "%02x\n" usb_intf_attr (bInterfaceSubClass, "%02x\n") usb_intf_attr (bInterfaceProtocol, "%02x\n") -static ssize_t show_interface_string (struct device *dev,char *buf) +static ssize_t show_interface_string (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_interface *intf;struct usb_device *udev;
drivers/usb/gadget/dummy_hcd.c +2 -2
@@ -633,7 +633,7 @@ static const struct usb_gadget_ops dummy/* "function" sysfs attribute */ static ssize_t -show_function (struct device *dev,char *buf) +show_function (struct device *dev,struct device_attribute *attr,char *buf) {struct dummy *dum =gadget_dev_to_dummy (dev);
@@ -1600,7 +1600,7 @@ show_urb (char *buf, size_t size, struct }static ssize_t -show_urbs (struct device *dev,char *buf) +show_urbs (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_hcd *hcd =dev_get_drvdata (dev);struct dummy *dum =hcd_to_dummy (hcd);
drivers/usb/gadget/file_storage.c +4 -4
@@ -3554,14 +3554,14 @@ static void close_all_backing_files(stru } -static ssize_t show_ro (struct device *dev,char *buf) +static ssize_t show_ro (struct device *dev,struct device_attribute *attr,char *buf) {struct lun *curlun =dev_to_lun (dev);return sprintf (buf,"%d\n" , curlun->ro); } -static ssize_t show_file (struct device *dev,char *buf) +static ssize_t show_file (struct device *dev,struct device_attribute *attr,char *buf) {struct lun *curlun =dev_to_lun (dev);struct fsg_dev *fsg = (struct fsg_dev *)dev_get_drvdata (dev);
@@ -3589,7 +3589,7 @@ static ssize_t show_file(struct device * } -static ssize_t store_ro (struct device *dev,const char *buf,size_t count) +static ssize_t store_ro (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {ssize_t rc = count;struct lun *curlun =dev_to_lun (dev);
@@ -3613,7 +3613,7 @@ static ssize_t store_ro(struct device *dreturn rc; } -static ssize_t store_file (struct device *dev,const char *buf,size_t count) +static ssize_t store_file (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) {struct lun *curlun =dev_to_lun (dev);struct fsg_dev *fsg = (struct fsg_dev *)dev_get_drvdata (dev);
drivers/usb/gadget/net2280.c +3 -3
@@ -1469,7 +1469,7 @@ static const struct usb_gadget_ops net22/* "function" sysfs attribute */ static ssize_t -show_function (struct device *_dev,char *buf) +show_function (struct device *_dev,struct device_attribute *attr,char *buf) {struct net2280 *dev =dev_get_drvdata (_dev);
@@ -1482,7 +1482,7 @@ show_function (struct device *_dev, char static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);static ssize_t -show_registers (struct device *_dev,char *buf) +show_registers (struct device *_dev,struct device_attribute *attr,char *buf) {struct net2280 *dev;char *next;
@@ -1637,7 +1637,7 @@ show_registers (struct device *_dev, cha static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);static ssize_t -show_queues (struct device *_dev,char *buf) +show_queues (struct device *_dev,struct device_attribute *attr,char *buf) {struct net2280 *dev;char *next;
drivers/usb/gadget/pxa2xx_udc.c +1 -1
@@ -1429,7 +1429,7 @@ done:/* "function" sysfs attribute */ static ssize_t -show_function (struct device *_dev,char *buf) +show_function (struct device *_dev,struct device_attribute *attr,char *buf) {struct pxa2xx_udc *dev =dev_get_drvdata (_dev);
PATCH 1/1 Driver Core: include: update device attribute callbacks
[PATCH] Driver Core: include: update device attribute callbacks
Signed-off-by Yani Ioannou <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit f2d03e1b3f00f1c5971463ab0101bef0c521ad3b
tree 44b0daa72e356e830066d0027f128106d7476ddb
parent 060b8845e6bea938d65ad6f89e83507e5ff4fec4
author Yani Ioannou <[email protected]> Tue, 17 May 2005 06:44:59 -0400 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:35 -0700
include/asm-ppc/ocp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/asm-ppc/ocp.h +1 -1
@@ -189,7 +189,7 @@ extern void ocp_for_each_device(void(*ca/* Sysfs support */ #define OCP_SYSFS_ADDTL (type, format, name, field) \ static ssize_t \ -show_##name##_##field(struct device *dev, char *buf) \ +show_##name##_##field(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct ocp_device *odev = to_ocp_dev(dev); \ type *add = odev->def->additions; \
PATCH 1/1 I2C: drivers/i2c/chips/adm1026.c: use dynamic sysfs callbacks
[PATCH] I2C: drivers/i2c/chips/adm1026.c: use dynamic sysfs callbacks
Finally (phew!) this patch demonstrates how to adapt the adm1026 to take advantage of the new callbacks, and the i2c-sysfs.h defined structure/macros. Most of the other sensor/hwmon drivers could be updated in the same way. The odd few exceptions (bmcsensors for example) however might be better off with their own custom attribute structure.
Signed-off-by Yani Ioannou <[email protected]>
Signed-off-by Jean Delvare <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 050480f12aeab62d39a1a07546606a47217ebefa
tree ffae2c627f613c6da54599f0752d38039c22a011
parent 0a3e7eeabc9f76b7496488aad2d11626ff6a2a4f
author Yani Ioannou <[email protected]> Sun, 05 Jun 2005 10:51:46 +0200 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:36 -0700
drivers/i2c/chips/adm1026.c | 524 ++++++++++++++++++++----------------------- 1 files changed, 241 insertions(+), 283 deletions(-)
drivers/i2c/chips/adm1026.c +241 -283
@@ -30,6 +30,7 @@#include <linux/jiffies.h> #include <linux/i2c.h> #include <linux/i2c-sensor.h> +#include <linux/i2c-sysfs.h> #include <linux/i2c-vid.h> /* Addresses to scan */
@@ -711,19 +712,27 @@ static struct adm1026_data *adm1026_updareturn data; } -static ssize_t show_in (struct device *dev,char *buf,int nr) +static ssize_t show_in (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,INS_FROM_REG (nr, data->in[nr])); } -static ssize_t show_in_min (struct device *dev,char *buf,int nr) +static ssize_t show_in_min (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,INS_FROM_REG (nr, data->in_min[nr])); } -static ssize_t set_in_min (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_in_min (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -734,14 +743,19 @@ static ssize_t set_in_min(struct deviceup (&data->update_lock);return count; } -static ssize_t show_in_max (struct device *dev,char *buf,int nr) +static ssize_t show_in_max (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,INS_FROM_REG (nr, data->in_max[nr])); } -static ssize_t set_in_max (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_in_max (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -753,34 +767,13 @@ static ssize_t set_in_max(struct devicereturn count; } -#define in_reg (offset) \ -static ssize_t show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_in(dev, buf, offset); \ -} \ -static ssize_t show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_in_min(dev, buf, offset); \ -} \ -static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_in_min(dev, buf, count, offset); \ -} \ -static ssize_t show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_in_max(dev, buf, offset); \ -} \ -static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_in_max(dev, buf, count, offset); \ -} \ -static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL); \ -static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ - show_in##offset##_min, set_in##offset##_min); \ -static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \ - show_in##offset##_max, set_in##offset##_max); +#define in_reg (offset) \ +static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in, \ + NULL, offset); \ +static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \ + show_in_min, set_in_min, offset); \ +static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \ + show_in_max, set_in_max, offset);in_reg (0 );
@@ -843,30 +836,38 @@ static ssize_t set_in16_max(struct devicreturn count; } -static DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL); -static DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min, set_in16_min); -static DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max, set_in16_max); +static SENSOR_DEVICE_ATTR(in16_input, S_IRUGO, show_in16, NULL, 16); +static SENSOR_DEVICE_ATTR(in16_min, S_IRUGO | S_IWUSR, show_in16_min, set_in16_min, 16); +static SENSOR_DEVICE_ATTR(in16_max, S_IRUGO | S_IWUSR, show_in16_max, set_in16_max, 16);/* Now add fan read/write functions */ -static ssize_t show_fan (struct device *dev,char *buf,int nr) +static ssize_t show_fan (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,FAN_FROM_REG (data->fan[nr], data->fan_div[nr])); } -static ssize_t show_fan_min (struct device *dev,char *buf,int nr) +static ssize_t show_fan_min (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,FAN_FROM_REG (data->fan_min[nr], data->fan_div[nr])); } -static ssize_t set_fan_min (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_fan_min (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -879,23 +880,11 @@ static ssize_t set_fan_min(struct devicereturn count; } -#define fan_offset (offset) \ -static ssize_t show_fan_##offset (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_fan(dev, buf, offset - 1); \ -} \ -static ssize_t show_fan_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_fan_min(dev, buf, offset - 1); \ -} \ -static ssize_t set_fan_##offset##_min (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_fan_min(dev, buf, count, offset - 1); \ -} \ -static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL); \ -static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ - show_fan_##offset##_min, set_fan_##offset##_min); +#define fan_offset (offset) \ +static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL, \ + offset - 1); \ +static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \ + show_fan_min, set_fan_min, offset - 1);fan_offset (1 );fan_offset (2 );
@@ -926,14 +915,19 @@ static void fixup_fan_min(struct device }/* Now add fan_div read/write functions */ -static ssize_t show_fan_div (struct device *dev,char *buf,int nr) +static ssize_t show_fan_div (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" , data->fan_div[nr]); } -static ssize_t set_fan_div (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_fan_div (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val,orig_div,new_div,shift;
@@ -967,17 +961,8 @@ static ssize_t set_fan_div(struct device }#define fan_offset_div (offset) \ -static ssize_t show_fan_##offset##_div (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_fan_div(dev, buf, offset - 1); \ -} \ -static ssize_t set_fan_##offset##_div (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_fan_div(dev, buf, count, offset - 1); \ -} \ -static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \ - show_fan_##offset##_div, set_fan_##offset##_div); +static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \ + show_fan_div, set_fan_div, offset - 1);fan_offset_div (1 );fan_offset_div (2 );
@@ -989,19 +974,27 @@ fan_offset_div(7);fan_offset_div (8 );/* Temps */ -static ssize_t show_temp (struct device *dev,char *buf,int nr) +static ssize_t show_temp (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp[nr])); } -static ssize_t show_temp_min (struct device *dev,char *buf,int nr) +static ssize_t show_temp_min (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_min[nr])); } -static ssize_t set_temp_min (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_temp_min (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -1013,14 +1006,19 @@ static ssize_t set_temp_min(struct devicup (&data->update_lock);return count; } -static ssize_t show_temp_max (struct device *dev,char *buf,int nr) +static ssize_t show_temp_max (struct device *dev,struct device_attribute *attr, +char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_max[nr])); } -static ssize_t set_temp_max (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_temp_max (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -1032,48 +1030,34 @@ static ssize_t set_temp_max(struct devicup (&data->update_lock);return count; } -#define temp_reg (offset) \ -static ssize_t show_temp_##offset (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_temp(dev, buf, offset - 1); \ -} \ -static ssize_t show_temp_##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_temp_min(dev, buf, offset - 1); \ -} \ -static ssize_t show_temp_##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_temp_max(dev, buf, offset - 1); \ -} \ -static ssize_t set_temp_##offset##_min (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_temp_min(dev, buf, count, offset - 1); \ -} \ -static ssize_t set_temp_##offset##_max (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_temp_max(dev, buf, count, offset - 1); \ -} \ -static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL); \ -static DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \ - show_temp_##offset##_min, set_temp_##offset##_min); \ -static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ - show_temp_##offset##_max, set_temp_##offset##_max); + +#define temp_reg (offset) \ +static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp, \ + NULL, offset - 1); \ +static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR, \ + show_temp_min, set_temp_min, offset - 1); \ +static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR, \ + show_temp_max, set_temp_max, offset - 1);temp_reg (1 );temp_reg (2 );temp_reg (3 ); -static ssize_t show_temp_offset (struct device *dev,char *buf,int nr) +static ssize_t show_temp_offset (struct device *dev, +struct device_attribute *attr,char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_offset[nr])); } -static ssize_t set_temp_offset (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_temp_offset (struct device *dev, +struct device_attribute *attr,const char *buf, +size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -1086,46 +1070,45 @@ static ssize_t set_temp_offset(struct dereturn count; } -#define temp_offset_reg (offset) \ -static ssize_t show_temp_##offset##_offset (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_temp_offset(dev, buf, offset - 1); \ -} \ -static ssize_t set_temp_##offset##_offset (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_temp_offset(dev, buf, count, offset - 1); \ -} \ -static DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR, \ - show_temp_##offset##_offset, set_temp_##offset##_offset); +#define temp_offset_reg (offset) \ +static SENSOR_DEVICE_ATTR(temp##offset##_offset, S_IRUGO | S_IWUSR, \ + show_temp_offset, set_temp_offset, offset - 1);temp_offset_reg (1 );temp_offset_reg (2 );temp_offset_reg (3 ); -static ssize_t show_temp_auto_point1_temp_hyst (struct device *dev,char *buf, -int nr) +static ssize_t show_temp_auto_point1_temp_hyst (struct device *dev, +struct device_attribute *attr,char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (ADM1026_FAN_ACTIVATION_TEMP_HYST + data->temp_tmin[nr])); } -static ssize_t show_temp_auto_point2_temp (struct device *dev,char *buf, -int nr) +static ssize_t show_temp_auto_point2_temp (struct device *dev, +struct device_attribute *attr,char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_tmin[nr] +ADM1026_FAN_CONTROL_TEMP_RANGE )); } -static ssize_t show_temp_auto_point1_temp (struct device *dev,char *buf, -int nr) +static ssize_t show_temp_auto_point1_temp (struct device *dev, +struct device_attribute *attr,char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_tmin[nr])); } -static ssize_t set_temp_auto_point1_temp (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_temp_auto_point1_temp (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -1138,46 +1121,27 @@ static ssize_t set_temp_auto_point1_tempreturn count; } -#define temp_auto_point (offset) \ -static ssize_t show_temp##offset##_auto_point1_temp (struct device *dev, struct device_attribute *attr, \ - char *buf) \ -{ \ - return show_temp_auto_point1_temp(dev, buf, offset - 1); \ -} \ -static ssize_t set_temp##offset##_auto_point1_temp (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_temp_auto_point1_temp(dev, buf, count, offset - 1); \ -} \ -static ssize_t show_temp##offset##_auto_point1_temp_hyst (struct device \ - *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_temp_auto_point1_temp_hyst(dev, buf, offset - 1); \ -} \ -static ssize_t show_temp##offset##_auto_point2_temp (struct device *dev, struct device_attribute *attr, \ - char *buf) \ -{ \ - return show_temp_auto_point2_temp(dev, buf, offset - 1); \ -} \ -static DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR, \ - show_temp##offset##_auto_point1_temp, \ - set_temp##offset##_auto_point1_temp); \ -static DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO, \ - show_temp##offset##_auto_point1_temp_hyst, NULL); \ -static DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO, \ - show_temp##offset##_auto_point2_temp, NULL); +#define temp_auto_point (offset) \ +static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp, S_IRUGO | S_IWUSR, \ + show_temp_auto_point1_temp, set_temp_auto_point1_temp, \ + offset - 1); \ +static SENSOR_DEVICE_ATTR(temp##offset##_auto_point1_temp_hyst, S_IRUGO, \ + show_temp_auto_point1_temp_hyst, NULL, offset - 1); \ +static SENSOR_DEVICE_ATTR(temp##offset##_auto_point2_temp, S_IRUGO, \ + show_temp_auto_point2_temp, NULL, offset - 1);temp_auto_point (1 );temp_auto_point (2 );temp_auto_point (3 ); -static ssize_t show_temp_crit_enable (struct device *dev,struct device_attribute *attr,char *buf) +static ssize_t show_temp_crit_enable (struct device *dev, +struct device_attribute *attr,char *buf) {struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" , (data->config1 &CFG1_THERM_HOT ) >>4 ); } -static ssize_t set_temp_crit_enable (struct device *dev,struct device_attribute *attr,const char *buf, -size_t count) +static ssize_t set_temp_crit_enable (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count) {struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);
@@ -1193,24 +1157,27 @@ static ssize_t set_temp_crit_enable(strureturn count; } -static DEVICE_ATTR(temp1_crit_enable, S_IRUGO | S_IWUSR, - show_temp_crit_enable, set_temp_crit_enable); - -static DEVICE_ATTR(temp2_crit_enable, S_IRUGO | S_IWUSR, - show_temp_crit_enable, set_temp_crit_enable); - -static DEVICE_ATTR(temp3_crit_enable, S_IRUGO | S_IWUSR, +#define temp_crit_enable (offset) \ +static DEVICE_ATTR(temp##offset##_crit_enable, S_IRUGO | S_IWUSR, \ show_temp_crit_enable, set_temp_crit_enable); +temp_crit_enable (1 ); +temp_crit_enable (2 ); +temp_crit_enable (3 ); -static ssize_t show_temp_crit (struct device *dev,char *buf,int nr) +static ssize_t show_temp_crit (struct device *dev, +struct device_attribute *attr,char *buf) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct adm1026_data *data =adm1026_update_device (dev);return sprintf (buf,"%d\n" ,TEMP_FROM_REG (data->temp_crit[nr])); } -static ssize_t set_temp_crit (struct device *dev,const char *buf, -size_t count,int nr) +static ssize_t set_temp_crit (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) { +struct sensor_device_attribute *sensor_attr =to_sensor_dev_attr (attr); +int nr = sensor_attr->index;struct i2c_client *client =to_i2c_client (dev);struct adm1026_data *data =i2c_get_clientdata (client);int val =simple_strtol (buf,NULL ,10 );
@@ -1223,18 +1190,9 @@ static ssize_t set_temp_crit(struct devireturn count; } -#define temp_crit_reg (offset) \ -static ssize_t show_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, char *buf) \ -{ \ - return show_temp_crit(dev, buf, offset - 1); \ -} \ -static ssize_t set_temp_##offset##_crit (struct device *dev, struct device_attribute *attr, \ - const char *buf, size_t count) \ -{ \ - return set_temp_crit(dev, buf, count, offset - 1); \ -} \ -static DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR, \ - show_temp_##offset##_crit, set_temp_##offset##_crit); +#define temp_crit_reg (offset) \ +static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IRUGO | S_IWUSR, \ + show_temp_crit, set_temp_crit, offset - 1);temp_crit_reg (1 );temp_crit_reg (2 );
@@ -1597,114 +1555,114 @@ int adm1026_detect(struct i2c_adapter *aadm1026_init_client (new_client);/* Register sysfs hooks */ -device_create_file (&new_client->dev, &dev_attr_in0_input); -device_create_file (&new_client->dev, &dev_attr_in0_max); -device_create_file (&new_client->dev, &dev_attr_in0_min); -device_create_file (&new_client->dev, &dev_attr_in1_input); -device_create_file (&new_client->dev, &dev_attr_in1_max); -device_create_file (&new_client->dev, &dev_attr_in1_min); -device_create_file (&new_client->dev, &dev_attr_in2_input); -device_create_file (&new_client->dev, &dev_attr_in2_max); -device_create_file (&new_client->dev, &dev_attr_in2_min); -device_create_file (&new_client->dev, &dev_attr_in3_input); -device_create_file (&new_client->dev, &dev_attr_in3_max); -device_create_file (&new_client->dev, &dev_attr_in3_min); -device_create_file (&new_client->dev, &dev_attr_in4_input); -device_create_file (&new_client->dev, &dev_attr_in4_max); -device_create_file (&new_client->dev, &dev_attr_in4_min); -device_create_file (&new_client->dev, &dev_attr_in5_input); -device_create_file (&new_client->dev, &dev_attr_in5_max); -device_create_file (&new_client->dev, &dev_attr_in5_min); -device_create_file (&new_client->dev, &dev_attr_in6_input); -device_create_file (&new_client->dev, &dev_attr_in6_max); -device_create_file (&new_client->dev, &dev_attr_in6_min); -device_create_file (&new_client->dev, &dev_attr_in7_input); -device_create_file (&new_client->dev, &dev_attr_in7_max); -device_create_file (&new_client->dev, &dev_attr_in7_min); -device_create_file (&new_client->dev, &dev_attr_in8_input); -device_create_file (&new_client->dev, &dev_attr_in8_max); -device_create_file (&new_client->dev, &dev_attr_in8_min); -device_create_file (&new_client->dev, &dev_attr_in9_input); -device_create_file (&new_client->dev, &dev_attr_in9_max); -device_create_file (&new_client->dev, &dev_attr_in9_min); -device_create_file (&new_client->dev, &dev_attr_in10_input); -device_create_file (&new_client->dev, &dev_attr_in10_max); -device_create_file (&new_client->dev, &dev_attr_in10_min); -device_create_file (&new_client->dev, &dev_attr_in11_input); -device_create_file (&new_client->dev, &dev_attr_in11_max); -device_create_file (&new_client->dev, &dev_attr_in11_min); -device_create_file (&new_client->dev, &dev_attr_in12_input); -device_create_file (&new_client->dev, &dev_attr_in12_max); -device_create_file (&new_client->dev, &dev_attr_in12_min); -device_create_file (&new_client->dev, &dev_attr_in13_input); -device_create_file (&new_client->dev, &dev_attr_in13_max); -device_create_file (&new_client->dev, &dev_attr_in13_min); -device_create_file (&new_client->dev, &dev_attr_in14_input); -device_create_file (&new_client->dev, &dev_attr_in14_max); -device_create_file (&new_client->dev, &dev_attr_in14_min); -device_create_file (&new_client->dev, &dev_attr_in15_input); -device_create_file (&new_client->dev, &dev_attr_in15_max); -device_create_file (&new_client->dev, &dev_attr_in15_min); -device_create_file (&new_client->dev, &dev_attr_in16_input); -device_create_file (&new_client->dev, &dev_attr_in16_max); -device_create_file (&new_client->dev, &dev_attr_in16_min); -device_create_file (&new_client->dev, &dev_attr_fan1_input); -device_create_file (&new_client->dev, &dev_attr_fan1_div); -device_create_file (&new_client->dev, &dev_attr_fan1_min); -device_create_file (&new_client->dev, &dev_attr_fan2_input); -device_create_file (&new_client->dev, &dev_attr_fan2_div); -device_create_file (&new_client->dev, &dev_attr_fan2_min); -device_create_file (&new_client->dev, &dev_attr_fan3_input); -device_create_file (&new_client->dev, &dev_attr_fan3_div); -device_create_file (&new_client->dev, &dev_attr_fan3_min); -device_create_file (&new_client->dev, &dev_attr_fan4_input); -device_create_file (&new_client->dev, &dev_attr_fan4_div); -device_create_file (&new_client->dev, &dev_attr_fan4_min); -device_create_file (&new_client->dev, &dev_attr_fan5_input); -device_create_file (&new_client->dev, &dev_attr_fan5_div); -device_create_file (&new_client->dev, &dev_attr_fan5_min); -device_create_file (&new_client->dev, &dev_attr_fan6_input); -device_create_file (&new_client->dev, &dev_attr_fan6_div); -device_create_file (&new_client->dev, &dev_attr_fan6_min); -device_create_file (&new_client->dev, &dev_attr_fan7_input); -device_create_file (&new_client->dev, &dev_attr_fan7_div); -device_create_file (&new_client->dev, &dev_attr_fan7_min); -device_create_file (&new_client->dev, &dev_attr_fan8_input); -device_create_file (&new_client->dev, &dev_attr_fan8_div); -device_create_file (&new_client->dev, &dev_attr_fan8_min); -device_create_file (&new_client->dev, &dev_attr_temp1_input); -device_create_file (&new_client->dev, &dev_attr_temp1_max); -device_create_file (&new_client->dev, &dev_attr_temp1_min); -device_create_file (&new_client->dev, &dev_attr_temp2_input); -device_create_file (&new_client->dev, &dev_attr_temp2_max); -device_create_file (&new_client->dev, &dev_attr_temp2_min); -device_create_file (&new_client->dev, &dev_attr_temp3_input); -device_create_file (&new_client->dev, &dev_attr_temp3_max); -device_create_file (&new_client->dev, &dev_attr_temp3_min); -device_create_file (&new_client->dev, &dev_attr_temp1_offset); -device_create_file (&new_client->dev, &dev_attr_temp2_offset); -device_create_file (&new_client->dev, &dev_attr_temp3_offset); +device_create_file (&new_client->dev, &sensor_dev_attr_in0_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in0_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in0_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in1_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in1_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in1_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in2_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in2_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in2_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in3_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in3_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in3_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in4_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in4_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in4_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in5_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in5_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in5_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in6_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in6_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in6_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in7_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in7_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in7_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in8_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in8_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in8_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in9_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in9_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in9_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in10_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in10_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in10_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in11_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in11_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in11_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in12_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in12_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in12_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in13_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in13_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in13_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in14_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in14_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in14_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in15_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in15_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in15_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in16_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in16_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_in16_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan1_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan1_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan1_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan2_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan2_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan2_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan3_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan3_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan3_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan4_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan4_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan4_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan5_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan5_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan5_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan6_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan6_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan6_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan7_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan7_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan7_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan8_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan8_div.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_fan8_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp1_offset.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp2_offset.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp3_offset.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp1_auto_point1_temp); + &sensor_dev_attr_temp1_auto_point1_temp.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp2_auto_point1_temp); + &sensor_dev_attr_temp2_auto_point1_temp.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp3_auto_point1_temp); + &sensor_dev_attr_temp3_auto_point1_temp.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp1_auto_point1_temp_hyst); + &sensor_dev_attr_temp1_auto_point1_temp_hyst.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp2_auto_point1_temp_hyst); + &sensor_dev_attr_temp2_auto_point1_temp_hyst.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp3_auto_point1_temp_hyst); + &sensor_dev_attr_temp3_auto_point1_temp_hyst.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp1_auto_point2_temp); + &sensor_dev_attr_temp1_auto_point2_temp.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp2_auto_point2_temp); + &sensor_dev_attr_temp2_auto_point2_temp.dev_attr);device_create_file (&new_client->dev, - &dev_attr_temp3_auto_point2_temp); -device_create_file (&new_client->dev, &dev_attr_temp1_crit); -device_create_file (&new_client->dev, &dev_attr_temp2_crit); -device_create_file (&new_client->dev, &dev_attr_temp3_crit); + &sensor_dev_attr_temp3_auto_point2_temp.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp1_crit.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp2_crit.dev_attr); +device_create_file (&new_client->dev, &sensor_dev_attr_temp3_crit.dev_attr);device_create_file (&new_client->dev, &dev_attr_temp1_crit_enable);device_create_file (&new_client->dev, &dev_attr_temp2_crit_enable);device_create_file (&new_client->dev, &dev_attr_temp3_crit_enable);
PATCH 1/1 I2C: add i2c sensor_device_attribute and macros
[PATCH] I2C: add i2c sensor_device_attribute and macros
This patch creates a new header with a potential standard i2c sensor attribute type (which simply includes an int representing the sensor number/index) and the associated macros, SENSOR_DEVICE_ATTR to define a static attribute and to_sensor_dev_attr to get a sensor_device_attribute reference from an embedded device_attribute reference.
Signed-off-by Yani Ioannou <[email protected]>
---
commit 0a3e7eeabc9f76b7496488aad2d11626ff6a2a4f
tree 0cab827910fe12199d666b84919d88fb881fb82d
parent f2d03e1b3f00f1c5971463ab0101bef0c521ad3b
author Yani Ioannou <[email protected]> Tue, 17 May 2005 22:59:05 -0400 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:36 -0700
include/linux/i2c-sysfs.h | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-)
include/linux/i2c-sysfs.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* i2c-sysfs.h - i2c chip driver sysfs defines +* +* Copyright (C) 2005 Yani Ioannou <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ +#ifndef _LINUX_I2C_SYSFS_H +#define _LINUX_I2C_SYSFS_H + +struct sensor_device_attribute { +struct device_attribute dev_attr; +int index; +}; +#define to_sensor_dev_attr (_dev_attr) \ + container_of(_dev_attr, struct sensor_device_attribute, dev_attr) + +#define SENSOR_DEVICE_ATTR (_name,_mode,_show,_store,_index) \ +struct sensor_device_attribute sensor_dev_attr_##_name = { \ + .dev_attr = __ATTR(_name,_mode,_show,_store), \ + .index = _index, \ +} + +#endif /* _LINUX_I2C_SYSFS_H */
PATCH 1/1 sysfs-iattr: attach sysfs_dirent before new inode
[PATCH] sysfs-iattr: attach sysfs_dirent before new inode
o The following patch makes sure to attach sysfs_dirent to the dentry before allocation a new inode through sysfs_create(). This change is done as preparatory work for implementing ->i_op->setattr() functionality for sysfs objects.
Signed-off-by Maneesh Soni <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 6fa5c828c7fb6beef7035864bd2b18e7386fbdd5
tree 88c7c0a03fe13ad802721dcd54b9b93733e964fe
parent 050480f12aeab62d39a1a07546606a47217ebefa
author Maneesh Soni <[email protected]> Tue, 31 May 2005 10:38:12 +0530 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:36 -0700
fs/sysfs/dir.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-)
fs/sysfs/dir.c +15 -10
@@ -101,18 +101,19 @@ static int create_dir(struct kobject * kdown (&p->d_inode->i_sem); *d =sysfs_get_dentry (p,n);if (!IS_ERR (*d)) { - error =sysfs_create (*d, mode, init_dir); + error =sysfs_make_dirent (p->d_fsdata, *d, k, mode,SYSFS_DIR );if (!error) { - error =sysfs_make_dirent (p->d_fsdata, *d, k, mode, -SYSFS_DIR ); + error =sysfs_create (*d, mode, init_dir);if (!error) { p->d_inode->i_nlink++; (*d)->d_op = &sysfs_dentry_ops;d_rehash (*d); } } -if (error && (error != -EEXIST )) +if (error && (error != -EEXIST )) { +sysfs_put ((*d)->d_fsdata);d_drop (*d); + }dput (*d); }else error =PTR_ERR (*d);
@@ -171,17 +172,19 @@ static int sysfs_attach_attr(struct sysf init = init_file; } + dentry->d_fsdata =sysfs_get (sd); + sd->s_dentry = dentry; error =sysfs_create (dentry, (attr->mode &S_IALLUGO ) |S_IFREG , init); -if (error) +if (error) { +sysfs_put (sd);return error; + }if (bin_attr) { dentry->d_inode->i_size = bin_attr->size; dentry->d_inode->i_fop = &bin_fops; } dentry->d_op = &sysfs_dentry_ops; - dentry->d_fsdata =sysfs_get (sd); - sd->s_dentry = dentry;d_rehash (dentry);return 0 ;
@@ -191,13 +194,15 @@ static int sysfs_attach_link(struct sysf {int err =0 ; + dentry->d_fsdata =sysfs_get (sd); + sd->s_dentry = dentry; err =sysfs_create (dentry,S_IFLNK |S_IRWXUGO , init_symlink);if (!err) { dentry->d_op = &sysfs_dentry_ops; - dentry->d_fsdata =sysfs_get (sd); - sd->s_dentry = dentry;d_rehash (dentry); - } + }else +sysfs_put (sd); +return err; }
PATCH 1/1 Driver core: Don't "lose" devices on suspend on failure
[PATCH] Driver core: Don't "lose" devices on suspend on failure
I think we need this patch or we might "lose" devices to the dpm_irq_off list if a failure occurs during the suspend process.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 42b16c051c3f462095fb8c9bad1bc05b34518cb9
tree 3178bf5b2e3b516b6aea270c757adf728db83836
parent 8215534ce7d073423bfa9c17405c43ab7636ca03
author Benjamin Herrenschmidt <[email protected]> Tue, 31 May 2005 17:08:49 +1000 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:37 -0700
drivers/base/power/suspend.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
drivers/base/power/suspend.c +12 -1
@@ -114,8 +114,19 @@ int device_suspend(pm_message_t state)put_device (dev); }up (&dpm_list_sem); -if (error) +if (error) { +/* we failed... before resuming, bring back devices from +* dpm_off_irq list back to main dpm_off list, we do want +* to call resume() on them, in case they partially suspended +* despite returning -EAGAIN +*/ +while (!list_empty (&dpm_off_irq)) { +struct list_head * entry = dpm_off_irq.next; +list_del (entry); +list_add (entry, &dpm_off); + }dpm_resume (); + }up (&dpm_sem);return error; }
PATCH 1/1 sysfs-iattr: set inode attributes
[PATCH] sysfs-iattr: set inode attributes
o Following patch sets the attributes for newly allocated inodes for sysfs objects. If the object has non-default attributes, inode attributes are set as saved in sysfs_dirent->s_iattr, pointer to struct iattr.
Signed-off-by Maneesh Soni <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 8215534ce7d073423bfa9c17405c43ab7636ca03
tree b53aed1111cf10a7d42ef0695308c4a70b820747
parent 988d186de5b6966a71a8cc52e6cb4895fd2f7799
author Maneesh Soni <[email protected]> Tue, 31 May 2005 10:39:52 +0530 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:37 -0700
fs/sysfs/inode.c | 37 +++++++++++++++++++++++++++++++------ fs/sysfs/mount.c | 4 +++- fs/sysfs/sysfs.h | 2 +- 3 files changed, 35 insertions(+), 8 deletions(-)
fs/sysfs/inode.c +31 -6
@@ -91,18 +91,42 @@ int sysfs_setattr(struct dentry * dentryreturn error; } -struct inode *sysfs_new_inode (mode_t mode) +static inline void set_default_inode_attr (struct inode * inode,mode_t mode) +{ + inode->i_mode = mode; + inode->i_uid =0 ; + inode->i_gid =0 ; + inode->i_atime = inode->i_mtime = inode->i_ctime =CURRENT_TIME ; +} + +static inline void set_inode_attr (struct inode * inode,struct iattr * iattr) +{ + inode->i_mode = iattr->ia_mode; + inode->i_uid = iattr->ia_uid; + inode->i_gid = iattr->ia_gid; + inode->i_atime = iattr->ia_atime; + inode->i_mtime = iattr->ia_mtime; + inode->i_ctime = iattr->ia_ctime; +} + +struct inode *sysfs_new_inode (mode_t mode,struct sysfs_dirent * sd) {struct inode * inode =new_inode (sysfs_sb);if (inode) { - inode->i_mode = mode; - inode->i_uid =0 ; - inode->i_gid =0 ; inode->i_blksize =PAGE_CACHE_SIZE ; inode->i_blocks =0 ; - inode->i_atime = inode->i_mtime = inode->i_ctime =CURRENT_TIME ; inode->i_mapping->a_ops = &sysfs_aops; inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info; + inode->i_op = &sysfs_inode_operations; + +if (sd->s_iattr) { +/* sysfs_dirent has non-default attributes +* get them for the new inode from persistent copy +* in sysfs_dirent +*/ +set_inode_attr (inode, sd->s_iattr); + }else +set_default_inode_attr (inode, mode); }return inode; }
@@ -113,7 +137,8 @@ int sysfs_create(struct dentry * dentry,struct inode * inode =NULL ;if (dentry) {if (!dentry->d_inode) { -if ((inode =sysfs_new_inode (mode))) { +struct sysfs_dirent * sd = dentry->d_fsdata; +if ((inode =sysfs_new_inode (mode, sd))) {if (dentry->d_parent && dentry->d_parent->d_inode) {struct inode *p_inode = dentry->d_parent->d_inode; p_inode->i_mtime = p_inode->i_ctime =CURRENT_TIME ;
fs/sysfs/mount.c +3 -1
@@ -28,6 +28,7 @@ static struct sysfs_dirent sysfs_root = .s_children = LIST_HEAD_INIT(sysfs_root.s_children), .s_element = NULL, .s_type = SYSFS_ROOT, + .s_iattr = NULL, };static int sysfs_fill_super (struct super_block *sb,void *data,int silent)
@@ -42,7 +43,8 @@ static int sysfs_fill_super(struct super sb->s_time_gran =1 ; sysfs_sb = sb; - inode =sysfs_new_inode (S_IFDIR |S_IRWXU |S_IRUGO |S_IXUGO ); + inode =sysfs_new_inode (S_IFDIR |S_IRWXU |S_IRUGO |S_IXUGO , + &sysfs_root);if (inode) { inode->i_op = &sysfs_dir_inode_operations; inode->i_fop = &sysfs_dir_operations;
fs/sysfs/sysfs.h +1 -1
@@ -2,7 +2,7 @@extern struct vfsmount * sysfs_mount;extern kmem_cache_t *sysfs_dir_cachep; -extern struct inode *sysfs_new_inode (mode_t mode); +extern struct inode *sysfs_new_inode (mode_t mode,struct sysfs_dirent *);extern int sysfs_create (struct dentry *,int mode,int (*init)(struct inode *)); extern int sysfs_make_dirent(struct sysfs_dirent *, struct dentry *, void *,
PATCH 1/1 sysfs-iattr: add sysfs_setattr
[PATCH] sysfs-iattr: add sysfs_setattr
o This adds ->i_op->setattr VFS method for sysfs inodes. The changed attribues are saved in the persistent sysfs_dirent structure as a pointer to struct iattr. The struct iattr is allocated only for those sysfs_dirent's for which default attributes are getting changed. Thanks to Jon Smirl for this suggestion.
Signed-off-by Maneesh Soni <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 988d186de5b6966a71a8cc52e6cb4895fd2f7799
tree 428cb6c29cbe2563eb91f9f2a03512b7eafa9449
parent 6fa5c828c7fb6beef7035864bd2b18e7386fbdd5
author Maneesh Soni <[email protected]> Tue, 31 May 2005 10:39:14 +0530 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:37 -0700
fs/sysfs/dir.c | 1 + fs/sysfs/inode.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ fs/sysfs/sysfs.h | 2 ++ include/linux/sysfs.h | 1 + 4 files changed, 69 insertions(+), 0 deletions(-)
fs/sysfs/dir.c +1 -0
@@ -233,6 +233,7 @@ static struct dentry * sysfs_lookup(strustruct inode_operations sysfs_dir_inode_operations = { .lookup = sysfs_lookup, + .setattr = sysfs_setattr, };static void remove_dir (struct dentry * d)
fs/sysfs/inode.c +65 -0
71 lines not on this page · raw message
fs/sysfs/sysfs.h +2 -0
@@ -17,6 +17,7 @@ extern void sysfs_remove_subdir(struct dextern const unsigned char *sysfs_get_name (struct sysfs_dirent *sd);extern void sysfs_drop_dentry (struct sysfs_dirent *sd,struct dentry *parent); +extern int sysfs_setattr (struct dentry *dentry,struct iattr *iattr);extern struct rw_semaphore sysfs_rename_sem;extern struct super_block * sysfs_sb;
@@ -75,6 +76,7 @@ static inline void release_sysfs_dirent(kobject_put (sl->target_kobj);kfree (sl); } +kfree (sd->s_iattr);kmem_cache_free (sysfs_dir_cachep, sd); }
include/linux/sysfs.h +1 -0
@@ -73,6 +73,7 @@ struct sysfs_dirent {int s_type;umode_t s_mode;struct dentry * s_dentry; +struct iattr * s_iattr; };#define SYSFS_ROOT 0x0001
PATCH 1/1 SYSFS: fix PAGE_SIZE check
[PATCH] SYSFS: fix PAGE_SIZE check
Without this change I can't set an attribute exactly PAGE_SIZE in length. There is no need for zero termination because the interface uses lengths.
From: Jon Smirl <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 9d9d27fb651a7c95a46f276bacb4329db47470a6
tree cf25134082cb61e860f65af73adc91674ec74258
parent 42b16c051c3f462095fb8c9bad1bc05b34518cb9
author Jon Smirl <[email protected]> Tue, 14 Jun 2005 09:54:54 -0400 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:38 -0700
fs/sysfs/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/sysfs/file.c +1 -1
@@ -182,7 +182,7 @@ fill_write_buffer(struct sysfs_buffer *return -ENOMEM ;if (count >=PAGE_SIZE ) - count =PAGE_SIZE -1 ; + count =PAGE_SIZE ; error =copy_from_user (buffer->page,buf,count); buffer->needs_read_fill =1 ;return error ? -EFAULT : count;
PATCH 1/1 USB: fix show_modalias() function due to attribute change
[PATCH] USB: fix show_modalias() function due to attribute change
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 4893e9d1cfeb614b5155c43eefbb338b4f02cb34
tree 4f6637cf3496fa9d6d645d38680d542c21e8b263
parent 9d9d27fb651a7c95a46f276bacb4329db47470a6
author Greg Kroah-Hartman <[email protected]> Sun, 19 Jun 2005 12:21:43 +0200 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:27:35 -0700
drivers/usb/core/sysfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/core/sysfs.c +1 -1
@@ -286,7 +286,7 @@ static ssize_t show_interface_string(str } static DEVICE_ATTR(interface, S_IRUGO, show_interface_string, NULL); -static ssize_t show_modalias (struct device *dev,char *buf) +static ssize_t show_modalias (struct device *dev,struct device_attribute *attr,char *buf) {struct usb_interface *intf;struct usb_device *udev;
PATCH 1/1 PCI: fix show_modalias() function due to attribute change
[PATCH] PCI: fix show_modalias() function due to attribute change
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
commit 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05
tree c3ddd09b1ad6312fccecc67d26098bd634ea17de
parent 4893e9d1cfeb614b5155c43eefbb338b4f02cb34
author Greg Kroah-Hartman <[email protected]> Sun, 19 Jun 2005 12:21:43 +0200 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:28:51 -0700
drivers/pci/pci-sysfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pci-sysfs.c +1 -1
@@ -73,7 +73,7 @@ resource_show(struct device * dev, strucreturn (str - buf); } -static ssize_t modalias_show (struct device *dev,char *buf) +static ssize_t modalias_show (struct device *dev,struct device_attribute *attr,char *buf) {struct pci_dev *pci_dev =to_pci_dev (dev);
Re: [PATCH] Use device_for_each_child() to unregister devices in scsi_remove_target().
In reply to Greg KHHi Greg / Patrick -
I'm getting an oops with current (pulled today) 2.6 git, the device_for_each_child() does not seem to be deletion safe.
We hold the klist in place via the n_ref, but the kobj (in the struct device for the struct scsi_target) containing it is freed when the kref->refcount goes to zero.
Any fixes or ?
I haven't found any relevant patches or similar oopses.
The only (current) caller of scsi_remove_target() is in scsi_transport_fc.c, for scsi you could only hit this running with the emulex or qlogic drivers, but it could affect other replacements of list_for_each_entry_safe with device_for_each_child.
The oops:
[linux root]# Oops: Kernel access of bad area, sig: 11 [#1] SMP NR_CPUS=128 NUMA PSERIES LPAR
Modules linked in: qla2300 qla2xxx scsi_transport_fc scsi_mod<7>kobject_get -> c00000001dfde390 kref c00000001dfde3ac mem: 33 tg3 evdev joydev ipv6 ohci_hcd usbcore dm_mod NIP: C00000000020C408 XER: 00000000 LR: C000000000394DB8 CTR: C0000000002106D0 REGS: c00000001414b240 TRAP: 0300 Not tainted (2.6.13-rc1pm) MSR: 8000000000009032 EE: 1 PR: 0 FP: 0 ME: 1 IR/DR: 11 CR: 24000422 DAR: 6b6b6b6b6b6b6b7b DSISR: 0000000040000000 TASK: c000000002754030[12001] 'rmmod' THREAD: c000000014148000 CPU: 0
GPR00: C000000000394DAC C00000001414B4C0 C0000000005F4618 6B6B6B6B6B6B6B7B
GPR04: 8000000000009032 FFFFFFFFFFFFFFFF 0000000000000037 C0000000005111A4
GPR08: C000000000511198 C000000000514A60 C0000000006024D0 C0000000006023F0
GPR12: 0000000000000010 C0000000004B2000 0000000000000000 0000000010000000
GPR16: 0000000000000000 0000000000000000 0000000010000000 0000000000000000
GPR20: 0000000000000800 0000000000000002 0000000000000880 00000000FFFA7AF0
GPR24: 00000000FFFAA320 0000000010013008 D0000000003D5460 D0000000003D53D8
GPR28: 6B6B6B6B6B6B6B63 C00000001414B5C0 C000000000582FB8 6B6B6B6B6B6B6B6B NIP [c00000000020c408] .kref_get+0x0/0x28
LR [c000000000394db8] .klist_next+0x90/0x104
Call Trace: [c00000001414b4c0] [c000000000394dac] .klist_next+0x84/0x104 (unreliable) [c00000001414b550] [c00000000026c8e0] .device_for_each_child+0x7c/0xd0 [c00000001414b600] [d00000000030ac78] .scsi_remove_target+0xa8/0xe8 [scsi_mod] [c00000001414b690] [d0000000002c6898] .fc_rport_tgt_remove+0xb8/0xdc [scsi_transport_fc] [c00000001414b720] [d0000000002c6918] .fc_rport_terminate+0x5c/0xf0 [scsi_transport_fc] [c00000001414b7b0] [d0000000002c6b7c] .fc_remove_host+0x40/0xb8 [scsi_transport_fc] [c00000001414b830] [d0000000003e6a58] .qla2x00_remove_one+0x34/0x7c [qla2xxx] [c00000001414b8c0] [d0000000003b7010] .qla2300_remove_one+0x10/0x24 [qla2300] [c00000001414b940] [c00000000021bc88] .pci_device_remove+0x80/0x88 [c00000001414b9c0] [c00000000026efb0] .__device_release_driver+0xd4/0xdc [c00000001414ba50] [c00000000026f100] .driver_detach+0x148/0x14c [c00000001414baf0] [c00000000026e0d8] .bus_remove_driver+0xa0/0x128 [c00000001414bb90] [c00000000026f628] .driver_unregister+0x1c/0x40 [c00000001414bc20] [c00000000021bf58] .pci_unregister_driver+0x24/0xbc [c00000001414bcb0] [d0000000003b7068] .qla2300_exit+0x1c/0x34 [qla2300] [c00000001414bd30] [c000000000080014] .sys_delete_module+0x220/0x368 [c00000001414be30] [c00000000000d580] syscall_exit+0x0/0x18
Instruction dump:4bfffd94 e89e8080 e87e80f0 4be4baad 60000000 4bffff60 e89e8080 e87e80c8 4bffffec 38000001 90030000 4e800020 <81230000> 2fa90000 7c000026 5400fffe
-- Patrick Mansfield
Quoted 56 lines · Greg KH
[PATCH] Use
device_for_each_child()to unregister devices inscsi_remove_target().Signed-off-by Patrick Mochel <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Index:
gregkh-2.6/drivers/scsi/scsi_sysfs.c
===================================================================---
commit20b1e674230b642be662c5975923a0160ab9cbdc
tree749e1384c57576bfbe3ffd1414df321cc783296f
parent0293a509405dccecc30783a5d729d615b68d6a77
author [email protected] <[email protected]> Thu, 24 Mar 2005 19:03:59 -0800 committer Greg Kroah-Hartman <[email protected]> Mon, 20 Jun 2005 15:15:19 -0700drivers/scsi/scsi_sysfs.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)drivers/scsi/scsi_sysfs.c +9
-5@@ -669,6 +669,13 @@ void __scsi_remove_target(struct scsi_tascsi_target_reap (starget); } +static int __remove_child (struct device * dev,void * data) +{ +if (scsi_is_target_device (dev)) +__scsi_remove_target (to_scsi_target (dev)); +return 0 ; +} +/** * scsi_remove_target - try to remove a target and all its devices * @dev: generic starget or parent of generic stargets to be removed @@ -679,7 +686,7 @@ void __scsi_remove_target(struct scsi_ta*/ void scsi_remove_target (struct device *dev) { -struct device *rdev, *idev, *next; +struct device *rdev;if (scsi_is_target_device (dev)) {__scsi_remove_target (to_scsi_target (dev));@@ -687,10 +694,7 @@ void scsi_remove_target(struct device *d } rdev =get_device (dev); -list_for_each_entry_safe (idev, next, &dev->children, node) { -if (scsi_is_target_device (idev)) -__scsi_remove_target (to_scsi_target (idev)); - } +device_for_each_child (dev,NULL , __remove_child);put_device (rdev); }EXPORT_SYMBOL (scsi_remove_target);
Re: [PATCH] Use device_for_each_child() to unregister devices in scsi_remove_target().
Quoted 8 lines · Patrick Mansfield
Hi Greg / Patrick -
I'm getting an oops with current (pulled today) 2.6 git, the
device_for_each_child()does not seem to be deletion safe.We hold the klist in place via the
n_ref, but the kobj (in the struct device for the structscsi_target) containing it is freed when thekref->refcountgoes to zero.
But we grab a reference to that object right before we call device_for_each_child(), right? Or am I missing something here?
thanks,
greg k-h
Re: [PATCH] Use device_for_each_child() to unregister devices in scsi_remove_target().
Quoted 6 lines · Greg KH
Quoted 5 lines · Patrick Mansfield
Hi Greg / Patrick -
I'm getting an oops with current (pulled today) 2.6 git, the
device_for_each_child()does not seem to be deletion safe.
Quoted 6 lines
Quoted 3 lines
We hold the klist in place via the
n_ref, but the kobj (in the struct device for the structscsi_target) containing it is freed when thekref->refcountgoes to zero.But we grab a reference to that object right before we call
device_for_each_child(), right? Or am I missing something here?
No, we get another reference on the passed in dev argument (in this failing case, it is for an FC's rport), not its children (scsi_target) that we want to iterate over.
If all children (scsi_targets) are removed, then the put in scsi_remove_target() would (or could) set the rport refcount to zero and it would be deleted. But the scsi_target would already be gone.
Cases that are not affected are passed a scsi_target:scsi_is_target_device(dev) is true and we won't even call device_for_each_child().
Adding another get/put in __remove_child() does *not* help either, as it is the code within device_for_each_child() that needs another get/put of the kref instead of a get/put on the klist (well its n_ref); and if you do that, I don't see how the locking can be done correctly.
I thought we had some semaphores in scsi to protect calls to scsi_remove_target(), but I only see those for scsi_device scan/removal (the shost->scan_mutex).
It looks like scsi should not allow removal and additions to happen at the same time on any scsi_target (and adding up/down on shost->scan_mutex won't fix this problem).
-- Patrick Mansfield
Re: [PATCH] Add initial implementation of klist helpers.
In reply to Greg KHQuoted 3 lines · Greg KH
Internally, that routine takes the klist's lock, decrements the reference count of the previous
klist_nodeand increments the count of the nextklist_node. It then drops the lock and returns.
Sacrificing performance for scalability has never been the right thing in the past. Why would it be right now?
Signature · 3 lines
The Theory of Escalating Commitment: "The cost of continuing mistakes is borne by others, while the cost of admitting mistakes is borne by yourself." -- Joseph Stiglitz, Nobel Laureate in Economics
Re: [PATCH] Add initial implementation of klist helpers.
Quoted 8 lines · Rik van Riel
Quoted 3 lines · Greg KH
Internally, that routine takes the klist's lock, decrements the reference count of the previous
klist_nodeand increments the count of the nextklist_node. It then drops the lock and returns.Sacrificing performance for scalability has never been the right thing in the past. Why would it be right now?
This is not a performance critical piece of code at all. It's used to walk devices and drivers and busses at device insertion and removal time, and at module load and unload. All of which are not bottlenecks in benchmarks :)
Now if people want to use this for performance critical stuff, that would be a different story. But the odds that they would be doing this with kobjects would be very slim...
thanks,
greg k-h