Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc.c: update device attribute callbacks

Browse Source 
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Yani Ioannou 2005-05-17 06:43:37 -04:00 committed by Greg Kroah-Hartman
parent 3fd3c0a5f5
commit 10523b3b82
17 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
drivers/s390/net/qeth_sys.c
View File

@ -30,7 +30,7 @@ const char *VERSION_QETH_SYS_C = "$Revision: 1.51 $";
//low/high watermark //low/high watermark
static ssize_t 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; struct qeth_card *card = dev->driver_data;
if (!card) if (!card)
@ -58,7 +58,7 @@ qeth_dev_state_show(struct device *dev, char *buf)
static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL); static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
if (!card) if (!card)
@ -70,7 +70,7 @@ qeth_dev_chpid_show(struct device *dev, char *buf)
static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL); static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
if (!card) if (!card)
@ -81,7 +81,7 @@ qeth_dev_if_name_show(struct device *dev, char *buf)
static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL); static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
if (!card) if (!card)
@ -93,7 +93,7 @@ qeth_dev_card_type_show(struct device *dev, char *buf)
static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL); static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
if (!card) if (!card)
@ -103,7 +103,7 @@ qeth_dev_portno_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -129,7 +129,7 @@ qeth_dev_portno_store(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store); static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char portname[9] = {0, }; char portname[9] = {0, };
@ -146,7 +146,7 @@ qeth_dev_portname_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -177,7 +177,7 @@ static DEVICE_ATTR(portname, 0644, qeth_dev_portname_show,
qeth_dev_portname_store); qeth_dev_portname_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -188,7 +188,7 @@ qeth_dev_checksum_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -218,7 +218,7 @@ static DEVICE_ATTR(checksumming, 0644, qeth_dev_checksum_show,
qeth_dev_checksum_store); qeth_dev_checksum_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -237,7 +237,7 @@ qeth_dev_prioqing_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -290,7 +290,7 @@ static DEVICE_ATTR(priority_queueing, 0644, qeth_dev_prioqing_show,
qeth_dev_prioqing_store); qeth_dev_prioqing_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -301,7 +301,7 @@ qeth_dev_bufcnt_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -360,7 +360,7 @@ qeth_dev_route_show(struct qeth_card *card, struct qeth_routing_info *route,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -410,7 +410,7 @@ qeth_dev_route_store(struct qeth_card *card, struct qeth_routing_info *route,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -425,7 +425,7 @@ static DEVICE_ATTR(route4, 0644, qeth_dev_route4_show, qeth_dev_route4_store);
#ifdef CONFIG_QETH_IPV6 #ifdef CONFIG_QETH_IPV6
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -439,7 +439,7 @@ qeth_dev_route6_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -461,7 +461,7 @@ static DEVICE_ATTR(route6, 0644, qeth_dev_route6_show, qeth_dev_route6_store);
#endif #endif
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -472,7 +472,7 @@ qeth_dev_add_hhlen_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -499,7 +499,7 @@ static DEVICE_ATTR(add_hhlen, 0644, qeth_dev_add_hhlen_show,
qeth_dev_add_hhlen_store); qeth_dev_add_hhlen_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -510,7 +510,7 @@ qeth_dev_fake_ll_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -536,7 +536,7 @@ static DEVICE_ATTR(fake_ll, 0644, qeth_dev_fake_ll_show,
qeth_dev_fake_ll_store); qeth_dev_fake_ll_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -547,7 +547,7 @@ qeth_dev_fake_broadcast_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -574,7 +574,7 @@ static DEVICE_ATTR(fake_broadcast, 0644, qeth_dev_fake_broadcast_show,
qeth_dev_fake_broadcast_store); qeth_dev_fake_broadcast_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -596,7 +596,7 @@ qeth_dev_recover_store(struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store); static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -613,7 +613,7 @@ qeth_dev_broadcast_mode_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -651,7 +651,7 @@ static DEVICE_ATTR(broadcast_mode, 0644, qeth_dev_broadcast_mode_show,
qeth_dev_broadcast_mode_store); qeth_dev_broadcast_mode_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -667,7 +667,7 @@ qeth_dev_canonical_macaddr_show(struct device *dev, char *buf)
} }
static ssize_t 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) size_t count)
{ {
struct qeth_card *card = dev->driver_data; struct qeth_card *card = dev->driver_data;
@ -703,7 +703,7 @@ static DEVICE_ATTR(canonical_macaddr, 0644, qeth_dev_canonical_macaddr_show,
qeth_dev_canonical_macaddr_store); qeth_dev_canonical_macaddr_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -714,7 +714,7 @@ qeth_dev_layer2_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -742,7 +742,7 @@ static DEVICE_ATTR(layer2, 0644, qeth_dev_layer2_show,
qeth_dev_layer2_store); qeth_dev_layer2_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -762,7 +762,7 @@ qeth_dev_large_send_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
enum qeth_large_send_types type; enum qeth_large_send_types type;
@ -832,7 +832,7 @@ qeth_dev_blkt_store(struct qeth_card *card, const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -841,7 +841,7 @@ qeth_dev_blkt_total_show(struct device *dev, char *buf)
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -855,7 +855,7 @@ static DEVICE_ATTR(total, 0644, qeth_dev_blkt_total_show,
qeth_dev_blkt_total_store); qeth_dev_blkt_total_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -864,7 +864,7 @@ qeth_dev_blkt_inter_show(struct device *dev, char *buf)
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -876,7 +876,7 @@ static DEVICE_ATTR(inter, 0644, qeth_dev_blkt_inter_show,
qeth_dev_blkt_inter_store); qeth_dev_blkt_inter_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -886,7 +886,7 @@ qeth_dev_blkt_inter_jumbo_show(struct device *dev, char *buf)
static ssize_t static 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; struct qeth_card *card = dev->driver_data;
@ -956,7 +956,7 @@ qeth_check_layer2(struct qeth_card *card)
static ssize_t static 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; struct qeth_card *card = dev->driver_data;
@ -969,7 +969,7 @@ qeth_dev_ipato_enable_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -1004,7 +1004,7 @@ static QETH_DEVICE_ATTR(ipato_enable, enable, 0644,
qeth_dev_ipato_enable_store); qeth_dev_ipato_enable_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1018,7 +1018,7 @@ qeth_dev_ipato_invert4_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -1084,7 +1084,7 @@ qeth_dev_ipato_add_show(char *buf, struct qeth_card *card,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1153,7 +1153,7 @@ qeth_dev_ipato_add_store(const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1186,7 +1186,7 @@ qeth_dev_ipato_del_store(const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1201,7 +1201,7 @@ static QETH_DEVICE_ATTR(ipato_del4, del4, 0200, NULL,
#ifdef CONFIG_QETH_IPV6 #ifdef CONFIG_QETH_IPV6
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1215,7 +1215,7 @@ qeth_dev_ipato_invert6_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
char *tmp; char *tmp;
@ -1247,7 +1247,7 @@ static QETH_DEVICE_ATTR(ipato_invert6, invert6, 0644,
static ssize_t static 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; struct qeth_card *card = dev->driver_data;
@ -1258,7 +1258,7 @@ qeth_dev_ipato_add6_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1273,7 +1273,7 @@ static QETH_DEVICE_ATTR(ipato_add6, add6, 0644,
qeth_dev_ipato_add6_store); qeth_dev_ipato_add6_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1341,7 +1341,7 @@ qeth_dev_vipa_add_show(char *buf, struct qeth_card *card,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1381,7 +1381,7 @@ qeth_dev_vipa_add_store(const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1413,7 +1413,7 @@ qeth_dev_vipa_del_store(const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1428,7 +1428,7 @@ static QETH_DEVICE_ATTR(vipa_del4, del4, 0200, NULL,
#ifdef CONFIG_QETH_IPV6 #ifdef CONFIG_QETH_IPV6
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1439,7 +1439,7 @@ qeth_dev_vipa_add6_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1454,7 +1454,7 @@ static QETH_DEVICE_ATTR(vipa_add6, add6, 0644,
qeth_dev_vipa_add6_store); qeth_dev_vipa_add6_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1522,7 +1522,7 @@ qeth_dev_rxip_add_show(char *buf, struct qeth_card *card,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1562,7 +1562,7 @@ qeth_dev_rxip_add_store(const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1594,7 +1594,7 @@ qeth_dev_rxip_del_store(const char *buf, size_t count,
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1609,7 +1609,7 @@ static QETH_DEVICE_ATTR(rxip_del4, del4, 0200, NULL,
#ifdef CONFIG_QETH_IPV6 #ifdef CONFIG_QETH_IPV6
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1620,7 +1620,7 @@ qeth_dev_rxip_add6_show(struct device *dev, char *buf)
} }
static ssize_t 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; struct qeth_card *card = dev->driver_data;
@ -1635,7 +1635,7 @@ static QETH_DEVICE_ATTR(rxip_add6, add6, 0644,
qeth_dev_rxip_add6_store); qeth_dev_rxip_add6_store);
static ssize_t 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; struct qeth_card *card = dev->driver_data;

2
drivers/s390/scsi/zfcp_scsi.c
View File

@ -924,7 +924,7 @@ struct fc_function_template zfcp_transport_functions = {
* Generates attribute for a unit. * Generates attribute for a unit.
*/ */
#define ZFCP_DEFINE_SCSI_ATTR(_name, _format, _value) \ #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) \ char *buf) \
{ \ { \
struct scsi_device *sdev; \ struct scsi_device *sdev; \

10
drivers/s390/scsi/zfcp_sysfs_adapter.c
View File

@ -50,7 +50,7 @@ static const char fc_topologies[5][25] = {
* Generates attributes for an adapter. * Generates attributes for an adapter.
*/ */
#define ZFCP_DEFINE_ADAPTER_ATTR(_name, _format, _value) \ #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) \ char *buf) \
{ \ { \
struct zfcp_adapter *adapter; \ struct zfcp_adapter *adapter; \
@ -90,7 +90,7 @@ ZFCP_DEFINE_ADAPTER_ATTR(in_recovery, "%d\n", atomic_test_mask
* Store function of the "port_add" attribute of an adapter. * Store function of the "port_add" attribute of an adapter.
*/ */
static ssize_t 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; wwn_t wwpn;
char *endp; char *endp;
@ -135,7 +135,7 @@ static DEVICE_ATTR(port_add, S_IWUSR, NULL, zfcp_sysfs_port_add_store);
* Store function of the "port_remove" attribute of an adapter. * Store function of the "port_remove" attribute of an adapter.
*/ */
static ssize_t 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_adapter *adapter;
struct zfcp_port *port; struct zfcp_port *port;
@ -196,7 +196,7 @@ static DEVICE_ATTR(port_remove, S_IWUSR, NULL, zfcp_sysfs_port_remove_store);
* started for the belonging adapter. * started for the belonging adapter.
*/ */
static ssize_t 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) const char *buf, size_t count)
{ {
struct zfcp_adapter *adapter; struct zfcp_adapter *adapter;
@ -236,7 +236,7 @@ zfcp_sysfs_adapter_failed_store(struct device *dev,
* "0" if adapter is working, otherwise "1". * "0" if adapter is working, otherwise "1".
*/ */
static ssize_t 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; struct zfcp_adapter *adapter;

10
drivers/s390/scsi/zfcp_sysfs_port.c
View File

@ -53,7 +53,7 @@ zfcp_sysfs_port_release(struct device *dev)
* Generates attributes for a port. * Generates attributes for a port.
*/ */
#define ZFCP_DEFINE_PORT_ATTR(_name, _format, _value) \ #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) \ char *buf) \
{ \ { \
struct zfcp_port *port; \ struct zfcp_port *port; \
@ -82,7 +82,7 @@ ZFCP_DEFINE_PORT_ATTR(access_denied, "%d\n", atomic_test_mask
* Store function of the "unit_add" attribute of a port. * Store function of the "unit_add" attribute of a port.
*/ */
static ssize_t 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; fcp_lun_t fcp_lun;
char *endp; char *endp;
@ -125,7 +125,7 @@ static DEVICE_ATTR(unit_add, S_IWUSR, NULL, zfcp_sysfs_unit_add_store);
* @count: number of bytes in buffer * @count: number of bytes in buffer
*/ */
static ssize_t 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_port *port;
struct zfcp_unit *unit; struct zfcp_unit *unit;
@ -186,7 +186,7 @@ static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store);
* started for the belonging port. * started for the belonging port.
*/ */
static ssize_t 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; struct zfcp_port *port;
unsigned int val; unsigned int val;
@ -224,7 +224,7 @@ zfcp_sysfs_port_failed_store(struct device *dev, const char *buf, size_t count)
* "0" if port is working, otherwise "1". * "0" if port is working, otherwise "1".
*/ */
static ssize_t 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; struct zfcp_port *port;

6
drivers/s390/scsi/zfcp_sysfs_unit.c
View File

@ -53,7 +53,7 @@ zfcp_sysfs_unit_release(struct device *dev)
* Generates attribute for a unit. * Generates attribute for a unit.
*/ */
#define ZFCP_DEFINE_UNIT_ATTR(_name, _format, _value) \ #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) \ char *buf) \
{ \ { \
struct zfcp_unit *unit; \ struct zfcp_unit *unit; \
@ -86,7 +86,7 @@ ZFCP_DEFINE_UNIT_ATTR(access_readonly, "%d\n", atomic_test_mask
* started for the belonging unit. * started for the belonging unit.
*/ */
static ssize_t 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; struct zfcp_unit *unit;
unsigned int val; unsigned int val;
@ -123,7 +123,7 @@ zfcp_sysfs_unit_failed_store(struct device *dev, const char *buf, size_t count)
* "0" if unit is working, otherwise "1". * "0" if unit is working, otherwise "1".
*/ */
static ssize_t 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; struct zfcp_unit *unit;

2
drivers/scsi/53c700.c
View File

@ -2125,7 +2125,7 @@ static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)
} }
static ssize_t 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); struct scsi_device *SDp = to_scsi_device(dev);

4
drivers/scsi/arm/eesox.c
View File

@ -466,7 +466,7 @@ int eesoxscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, off_
return pos; return 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 expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec); struct Scsi_Host *host = ecard_get_drvdata(ec);
@ -475,7 +475,7 @@ static ssize_t eesoxscsi_show_term(struct device *dev, char *buf)
return sprintf(buf, "%d\n", info->control & EESOX_TERM_ENABLE ? 1 : 0); return 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 expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec); struct Scsi_Host *host = ecard_get_drvdata(ec);

4
drivers/scsi/arm/powertec.c
View File

@ -269,7 +269,7 @@ int powertecscsi_proc_info(struct Scsi_Host *host, char *buffer, char **start, o
return pos; return 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 expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec); struct Scsi_Host *host = ecard_get_drvdata(ec);
@ -279,7 +279,7 @@ static ssize_t powertecscsi_show_term(struct device *dev, char *buf)
} }
static ssize_t 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 expansion_card *ec = ECARD_DEV(dev);
struct Scsi_Host *host = ecard_get_drvdata(ec); struct Scsi_Host *host = ecard_get_drvdata(ec);

2
drivers/scsi/ipr.c
View File

@ -2716,7 +2716,7 @@ static int ipr_change_queue_type(struct scsi_device *sdev, int tag_type)
* Return value: * Return value:
* number of bytes printed to buffer * 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 scsi_device *sdev = to_scsi_device(dev);
struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata; struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;

4
drivers/scsi/megaraid/megaraid_mbox.c
View File

@ -124,7 +124,7 @@ static irqreturn_t megaraid_isr(int, void *, struct pt_regs *);
static void megaraid_mbox_dpc(unsigned long); static void megaraid_mbox_dpc(unsigned long);
static ssize_t megaraid_sysfs_show_app_hndl(struct class_device *, char *); 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_register(adapter_t *);
static int megaraid_cmm_unregister(adapter_t *); static int megaraid_cmm_unregister(adapter_t *);
@ -4145,7 +4145,7 @@ megaraid_sysfs_show_app_hndl(struct class_device *cdev, char *buf)
* @param buf : buffer to send data to * @param buf : buffer to send data to
*/ */
static ssize_t 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); struct scsi_device *sdev = to_scsi_device(dev);
adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host); adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host);

28
drivers/scsi/scsi_sysfs.c
View File

@ -230,7 +230,7 @@ void scsi_sysfs_unregister(void)
*/ */
#define sdev_show_function(field, format_string) \ #define sdev_show_function(field, format_string) \
static ssize_t \ 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; \ struct scsi_device *sdev; \
sdev = to_scsi_device(dev); \ sdev = to_scsi_device(dev); \
@ -254,7 +254,7 @@ static DEVICE_ATTR(field, S_IRUGO, sdev_show_##field, NULL);
sdev_show_function(field, format_string) \ sdev_show_function(field, format_string) \
\ \
static ssize_t \ 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; \ struct scsi_device *sdev; \
sdev = to_scsi_device(dev); \ sdev = to_scsi_device(dev); \
@ -274,7 +274,7 @@ static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##fie
sdev_show_function(field, "%d\n") \ sdev_show_function(field, "%d\n") \
\ \
static ssize_t \ 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; \ int ret; \
struct scsi_device *sdev; \ struct scsi_device *sdev; \
@ -317,7 +317,7 @@ sdev_rd_attr (model, "%.16s\n");
sdev_rd_attr (rev, "%.4s\n"); sdev_rd_attr (rev, "%.4s\n");
static ssize_t 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; struct scsi_device *sdev;
sdev = to_scsi_device(dev); sdev = to_scsi_device(dev);
@ -325,7 +325,7 @@ sdev_show_timeout (struct device *dev, char *buf)
} }
static ssize_t 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; struct scsi_device *sdev;
int timeout; int timeout;
@ -337,14 +337,14 @@ sdev_store_timeout (struct device *dev, const char *buf, size_t count)
static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout); static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout);
static ssize_t 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); scsi_rescan_device(dev);
return count; return count;
} }
static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field); 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) size_t count)
{ {
scsi_remove_device(to_scsi_device(dev)); scsi_remove_device(to_scsi_device(dev));
@ -353,7 +353,7 @@ static ssize_t sdev_store_delete(struct device *dev, const char *buf,
static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete); static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);
static ssize_t 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; int i;
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);
@ -376,7 +376,7 @@ store_state_field(struct device *dev, const char *buf, size_t count)
} }
static ssize_t 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); struct scsi_device *sdev = to_scsi_device(dev);
const char *name = scsi_device_state_name(sdev->sdev_state); const char *name = scsi_device_state_name(sdev->sdev_state);
@ -390,7 +390,7 @@ show_state_field(struct device *dev, char *buf)
static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_state_field, store_state_field); static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_state_field, store_state_field);
static ssize_t 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); struct scsi_device *sdev = to_scsi_device(dev);
const char *name = "none"; const char *name = "none";
@ -406,7 +406,7 @@ show_queue_type_field(struct device *dev, char *buf)
static DEVICE_ATTR(queue_type, S_IRUGO, show_queue_type_field, NULL); static DEVICE_ATTR(queue_type, S_IRUGO, show_queue_type_field, NULL);
static ssize_t 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); return snprintf(buf, 20, "%d\n", (int)sizeof(atomic_t) * 8);
} }
@ -415,7 +415,7 @@ static DEVICE_ATTR(iocounterbits, S_IRUGO, show_iostat_counterbits, NULL);
#define show_sdev_iostat(field) \ #define show_sdev_iostat(field) \
static ssize_t \ 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); \ struct scsi_device *sdev = to_scsi_device(dev); \
unsigned long long count = atomic_read(&sdev->field); \ unsigned long long count = atomic_read(&sdev->field); \
@ -449,7 +449,7 @@ static struct device_attribute *scsi_sysfs_sdev_attrs[] = {
NULL 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) size_t count)
{ {
int depth, retval; int depth, retval;
@ -475,7 +475,7 @@ static struct device_attribute sdev_attr_queue_depth_rw =
__ATTR(queue_depth, S_IRUGO | S_IWUSR, sdev_show_queue_depth, __ATTR(queue_depth, S_IRUGO | S_IWUSR, sdev_show_queue_depth,
sdev_store_queue_depth_rw); 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) size_t count)
{ {
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);

2
drivers/sh/superhyway/superhyway-sysfs.c
View File

@ -15,7 +15,7 @@
#include <linux/superhyway.h> #include <linux/superhyway.h>
#define superhyway_ro_attr(name, fmt, field) \ #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); \ struct superhyway_device *s = to_superhyway_device(dev); \
return sprintf(buf, fmt, s->field); \ return sprintf(buf, fmt, s->field); \

24
drivers/usb/core/sysfs.c
View File

@ -24,7 +24,7 @@
/* Active configuration fields */ /* Active configuration fields */
#define usb_actconfig_show(field, multiplier, format_string) \ #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_device *udev; \
struct usb_host_config *actconfig; \ struct usb_host_config *actconfig; \
@ -46,7 +46,7 @@ usb_actconfig_attr (bNumInterfaces, 1, "%2d\n")
usb_actconfig_attr (bmAttributes, 1, "%2x\n") usb_actconfig_attr (bmAttributes, 1, "%2x\n")
usb_actconfig_attr (bMaxPower, 2, "%3dmA\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_device *udev;
struct usb_host_config *actconfig; struct usb_host_config *actconfig;
@ -69,7 +69,7 @@ static DEVICE_ATTR(configuration, S_IRUGO, show_configuration_string, NULL);
usb_actconfig_show(bConfigurationValue, 1, "%u\n"); usb_actconfig_show(bConfigurationValue, 1, "%u\n");
static ssize_t 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); struct usb_device *udev = udev = to_usb_device (dev);
int config, value; int config, value;
@ -87,7 +87,7 @@ static DEVICE_ATTR(bConfigurationValue, S_IRUGO | S_IWUSR,
/* String fields */ /* String fields */
#define usb_string_attr(name) \ #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; \ struct usb_device *udev; \
int len; \ int len; \
@ -107,7 +107,7 @@ usb_string_attr(manufacturer);
usb_string_attr(serial); usb_string_attr(serial);
static ssize_t 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; struct usb_device *udev;
char *speed; char *speed;
@ -133,7 +133,7 @@ show_speed (struct device *dev, char *buf)
static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL); static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL);
static ssize_t 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; struct usb_device *udev;
@ -143,7 +143,7 @@ show_devnum (struct device *dev, char *buf)
static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL); static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);
static ssize_t 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; struct usb_device *udev;
u16 bcdUSB; u16 bcdUSB;
@ -155,7 +155,7 @@ show_version (struct device *dev, char *buf)
static DEVICE_ATTR(version, S_IRUGO, show_version, NULL); static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
static ssize_t 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; struct usb_device *udev;
@ -167,7 +167,7 @@ static DEVICE_ATTR(maxchild, S_IRUGO, show_maxchild, NULL);
/* Descriptor fields */ /* Descriptor fields */
#define usb_descriptor_attr_le16(field, format_string) \ #define usb_descriptor_attr_le16(field, format_string) \
static ssize_t \ 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; \ struct usb_device *udev; \
\ \
@ -183,7 +183,7 @@ usb_descriptor_attr_le16(bcdDevice, "%04x\n")
#define usb_descriptor_attr(field, format_string) \ #define usb_descriptor_attr(field, format_string) \
static ssize_t \ 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; \ struct usb_device *udev; \
\ \
@ -254,7 +254,7 @@ void usb_remove_sysfs_dev_files (struct usb_device *udev)
/* Interface fields */ /* Interface fields */
#define usb_intf_attr(field, format_string) \ #define usb_intf_attr(field, format_string) \
static ssize_t \ 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); \ 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 (bInterfaceSubClass, "%02x\n")
usb_intf_attr (bInterfaceProtocol, "%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_interface *intf;
struct usb_device *udev; struct usb_device *udev;

4
drivers/usb/gadget/dummy_hcd.c
View File

@ -633,7 +633,7 @@ static const struct usb_gadget_ops dummy_ops = {
/* "function" sysfs attribute */ /* "function" sysfs attribute */
static ssize_t 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); struct dummy *dum = gadget_dev_to_dummy (dev);
@ -1600,7 +1600,7 @@ show_urb (char *buf, size_t size, struct urb *urb)
} }
static ssize_t 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 usb_hcd *hcd = dev_get_drvdata (dev);
struct dummy *dum = hcd_to_dummy (hcd); struct dummy *dum = hcd_to_dummy (hcd);

8
drivers/usb/gadget/file_storage.c
View File

@ -3554,14 +3554,14 @@ static void close_all_backing_files(struct fsg_dev *fsg)
} }
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); struct lun *curlun = dev_to_lun(dev);
return sprintf(buf, "%d\n", curlun->ro); 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 lun *curlun = dev_to_lun(dev);
struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev); struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
@ -3589,7 +3589,7 @@ static ssize_t show_file(struct device *dev, char *buf)
} }
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; ssize_t rc = count;
struct lun *curlun = dev_to_lun(dev); struct lun *curlun = dev_to_lun(dev);
@ -3613,7 +3613,7 @@ static ssize_t store_ro(struct device *dev, const char *buf, size_t count)
return rc; return 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 lun *curlun = dev_to_lun(dev);
struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev); struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev);

6
drivers/usb/gadget/net2280.c
View File

@ -1469,7 +1469,7 @@ static const struct usb_gadget_ops net2280_ops = {
/* "function" sysfs attribute */ /* "function" sysfs attribute */
static ssize_t 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); struct net2280 *dev = dev_get_drvdata (_dev);
@ -1482,7 +1482,7 @@ show_function (struct device *_dev, char *buf)
static DEVICE_ATTR (function, S_IRUGO, show_function, NULL); static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
static ssize_t static ssize_t
show_registers (struct device *_dev, char *buf) show_registers (struct device *_dev, struct device_attribute *attr, char *buf)
{ {
struct net2280 *dev; struct net2280 *dev;
char *next; char *next;
@ -1637,7 +1637,7 @@ show_registers (struct device *_dev, char *buf)
static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL); static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
static ssize_t static ssize_t
show_queues (struct device *_dev, char *buf) show_queues (struct device *_dev, struct device_attribute *attr, char *buf)
{ {
struct net2280 *dev; struct net2280 *dev;
char *next; char *next;

2
drivers/usb/gadget/pxa2xx_udc.c
View File

@ -1429,7 +1429,7 @@ done:
/* "function" sysfs attribute */ /* "function" sysfs attribute */
static ssize_t 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); struct pxa2xx_udc *dev = dev_get_drvdata (_dev);