diff options
Diffstat (limited to 'drivers/s390/net')
-rw-r--r-- | drivers/s390/net/claw.c | 40 | ||||
-rw-r--r-- | drivers/s390/net/ctcmain.c | 18 | ||||
-rw-r--r-- | drivers/s390/net/lcs.c | 10 | ||||
-rw-r--r-- | drivers/s390/net/netiucv.c | 44 | ||||
-rw-r--r-- | drivers/s390/net/qeth_sys.c | 126 |
5 files changed, 119 insertions, 119 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index 06804d39a9c6..a99927d54ebb 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
@@ -241,20 +241,20 @@ static struct sk_buff *claw_pack_skb(struct claw_privbk *privptr); | |||
241 | static void dumpit (char *buf, int len); | 241 | static void dumpit (char *buf, int len); |
242 | #endif | 242 | #endif |
243 | /* sysfs Functions */ | 243 | /* sysfs Functions */ |
244 | static ssize_t claw_hname_show(struct device *dev, char *buf); | 244 | static ssize_t claw_hname_show(struct device *dev, struct device_attribute *attr, char *buf); |
245 | static ssize_t claw_hname_write(struct device *dev, | 245 | static ssize_t claw_hname_write(struct device *dev, struct device_attribute *attr, |
246 | const char *buf, size_t count); | 246 | const char *buf, size_t count); |
247 | static ssize_t claw_adname_show(struct device *dev, char *buf); | 247 | static ssize_t claw_adname_show(struct device *dev, struct device_attribute *attr, char *buf); |
248 | static ssize_t claw_adname_write(struct device *dev, | 248 | static ssize_t claw_adname_write(struct device *dev, struct device_attribute *attr, |
249 | const char *buf, size_t count); | 249 | const char *buf, size_t count); |
250 | static ssize_t claw_apname_show(struct device *dev, char *buf); | 250 | static ssize_t claw_apname_show(struct device *dev, struct device_attribute *attr, char *buf); |
251 | static ssize_t claw_apname_write(struct device *dev, | 251 | static ssize_t claw_apname_write(struct device *dev, struct device_attribute *attr, |
252 | const char *buf, size_t count); | 252 | const char *buf, size_t count); |
253 | static ssize_t claw_wbuff_show(struct device *dev, char *buf); | 253 | static ssize_t claw_wbuff_show(struct device *dev, struct device_attribute *attr, char *buf); |
254 | static ssize_t claw_wbuff_write(struct device *dev, | 254 | static ssize_t claw_wbuff_write(struct device *dev, struct device_attribute *attr, |
255 | const char *buf, size_t count); | 255 | const char *buf, size_t count); |
256 | static ssize_t claw_rbuff_show(struct device *dev, char *buf); | 256 | static ssize_t claw_rbuff_show(struct device *dev, struct device_attribute *attr, char *buf); |
257 | static ssize_t claw_rbuff_write(struct device *dev, | 257 | static ssize_t claw_rbuff_write(struct device *dev, struct device_attribute *attr, |
258 | const char *buf, size_t count); | 258 | const char *buf, size_t count); |
259 | static int claw_add_files(struct device *dev); | 259 | static int claw_add_files(struct device *dev); |
260 | static void claw_remove_files(struct device *dev); | 260 | static void claw_remove_files(struct device *dev); |
@@ -4149,7 +4149,7 @@ claw_remove_device(struct ccwgroup_device *cgdev) | |||
4149 | * sysfs attributes | 4149 | * sysfs attributes |
4150 | */ | 4150 | */ |
4151 | static ssize_t | 4151 | static ssize_t |
4152 | claw_hname_show(struct device *dev, char *buf) | 4152 | claw_hname_show(struct device *dev, struct device_attribute *attr, char *buf) |
4153 | { | 4153 | { |
4154 | struct claw_privbk *priv; | 4154 | struct claw_privbk *priv; |
4155 | struct claw_env * p_env; | 4155 | struct claw_env * p_env; |
@@ -4162,7 +4162,7 @@ claw_hname_show(struct device *dev, char *buf) | |||
4162 | } | 4162 | } |
4163 | 4163 | ||
4164 | static ssize_t | 4164 | static ssize_t |
4165 | claw_hname_write(struct device *dev, const char *buf, size_t count) | 4165 | claw_hname_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
4166 | { | 4166 | { |
4167 | struct claw_privbk *priv; | 4167 | struct claw_privbk *priv; |
4168 | struct claw_env * p_env; | 4168 | struct claw_env * p_env; |
@@ -4186,7 +4186,7 @@ claw_hname_write(struct device *dev, const char *buf, size_t count) | |||
4186 | static DEVICE_ATTR(host_name, 0644, claw_hname_show, claw_hname_write); | 4186 | static DEVICE_ATTR(host_name, 0644, claw_hname_show, claw_hname_write); |
4187 | 4187 | ||
4188 | static ssize_t | 4188 | static ssize_t |
4189 | claw_adname_show(struct device *dev, char *buf) | 4189 | claw_adname_show(struct device *dev, struct device_attribute *attr, char *buf) |
4190 | { | 4190 | { |
4191 | struct claw_privbk *priv; | 4191 | struct claw_privbk *priv; |
4192 | struct claw_env * p_env; | 4192 | struct claw_env * p_env; |
@@ -4199,7 +4199,7 @@ claw_adname_show(struct device *dev, char *buf) | |||
4199 | } | 4199 | } |
4200 | 4200 | ||
4201 | static ssize_t | 4201 | static ssize_t |
4202 | claw_adname_write(struct device *dev, const char *buf, size_t count) | 4202 | claw_adname_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
4203 | { | 4203 | { |
4204 | struct claw_privbk *priv; | 4204 | struct claw_privbk *priv; |
4205 | struct claw_env * p_env; | 4205 | struct claw_env * p_env; |
@@ -4223,7 +4223,7 @@ claw_adname_write(struct device *dev, const char *buf, size_t count) | |||
4223 | static DEVICE_ATTR(adapter_name, 0644, claw_adname_show, claw_adname_write); | 4223 | static DEVICE_ATTR(adapter_name, 0644, claw_adname_show, claw_adname_write); |
4224 | 4224 | ||
4225 | static ssize_t | 4225 | static ssize_t |
4226 | claw_apname_show(struct device *dev, char *buf) | 4226 | claw_apname_show(struct device *dev, struct device_attribute *attr, char *buf) |
4227 | { | 4227 | { |
4228 | struct claw_privbk *priv; | 4228 | struct claw_privbk *priv; |
4229 | struct claw_env * p_env; | 4229 | struct claw_env * p_env; |
@@ -4237,7 +4237,7 @@ claw_apname_show(struct device *dev, char *buf) | |||
4237 | } | 4237 | } |
4238 | 4238 | ||
4239 | static ssize_t | 4239 | static ssize_t |
4240 | claw_apname_write(struct device *dev, const char *buf, size_t count) | 4240 | claw_apname_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
4241 | { | 4241 | { |
4242 | struct claw_privbk *priv; | 4242 | struct claw_privbk *priv; |
4243 | struct claw_env * p_env; | 4243 | struct claw_env * p_env; |
@@ -4271,7 +4271,7 @@ claw_apname_write(struct device *dev, const char *buf, size_t count) | |||
4271 | static DEVICE_ATTR(api_type, 0644, claw_apname_show, claw_apname_write); | 4271 | static DEVICE_ATTR(api_type, 0644, claw_apname_show, claw_apname_write); |
4272 | 4272 | ||
4273 | static ssize_t | 4273 | static ssize_t |
4274 | claw_wbuff_show(struct device *dev, char *buf) | 4274 | claw_wbuff_show(struct device *dev, struct device_attribute *attr, char *buf) |
4275 | { | 4275 | { |
4276 | struct claw_privbk *priv; | 4276 | struct claw_privbk *priv; |
4277 | struct claw_env * p_env; | 4277 | struct claw_env * p_env; |
@@ -4284,7 +4284,7 @@ claw_wbuff_show(struct device *dev, char *buf) | |||
4284 | } | 4284 | } |
4285 | 4285 | ||
4286 | static ssize_t | 4286 | static ssize_t |
4287 | claw_wbuff_write(struct device *dev, const char *buf, size_t count) | 4287 | claw_wbuff_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
4288 | { | 4288 | { |
4289 | struct claw_privbk *priv; | 4289 | struct claw_privbk *priv; |
4290 | struct claw_env * p_env; | 4290 | struct claw_env * p_env; |
@@ -4312,7 +4312,7 @@ claw_wbuff_write(struct device *dev, const char *buf, size_t count) | |||
4312 | static DEVICE_ATTR(write_buffer, 0644, claw_wbuff_show, claw_wbuff_write); | 4312 | static DEVICE_ATTR(write_buffer, 0644, claw_wbuff_show, claw_wbuff_write); |
4313 | 4313 | ||
4314 | static ssize_t | 4314 | static ssize_t |
4315 | claw_rbuff_show(struct device *dev, char *buf) | 4315 | claw_rbuff_show(struct device *dev, struct device_attribute *attr, char *buf) |
4316 | { | 4316 | { |
4317 | struct claw_privbk *priv; | 4317 | struct claw_privbk *priv; |
4318 | struct claw_env * p_env; | 4318 | struct claw_env * p_env; |
@@ -4325,7 +4325,7 @@ claw_rbuff_show(struct device *dev, char *buf) | |||
4325 | } | 4325 | } |
4326 | 4326 | ||
4327 | static ssize_t | 4327 | static ssize_t |
4328 | claw_rbuff_write(struct device *dev, const char *buf, size_t count) | 4328 | claw_rbuff_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
4329 | { | 4329 | { |
4330 | struct claw_privbk *priv; | 4330 | struct claw_privbk *priv; |
4331 | struct claw_env *p_env; | 4331 | struct claw_env *p_env; |
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index ff3e95e07e89..96ca863eaff2 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c | |||
@@ -2469,7 +2469,7 @@ ctc_stats(struct net_device * dev) | |||
2469 | */ | 2469 | */ |
2470 | 2470 | ||
2471 | static ssize_t | 2471 | static ssize_t |
2472 | buffer_show(struct device *dev, char *buf) | 2472 | buffer_show(struct device *dev, struct device_attribute *attr, char *buf) |
2473 | { | 2473 | { |
2474 | struct ctc_priv *priv; | 2474 | struct ctc_priv *priv; |
2475 | 2475 | ||
@@ -2481,7 +2481,7 @@ buffer_show(struct device *dev, char *buf) | |||
2481 | } | 2481 | } |
2482 | 2482 | ||
2483 | static ssize_t | 2483 | static ssize_t |
2484 | buffer_write(struct device *dev, const char *buf, size_t count) | 2484 | buffer_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
2485 | { | 2485 | { |
2486 | struct ctc_priv *priv; | 2486 | struct ctc_priv *priv; |
2487 | struct net_device *ndev; | 2487 | struct net_device *ndev; |
@@ -2530,13 +2530,13 @@ einval: | |||
2530 | } | 2530 | } |
2531 | 2531 | ||
2532 | static ssize_t | 2532 | static ssize_t |
2533 | loglevel_show(struct device *dev, char *buf) | 2533 | loglevel_show(struct device *dev, struct device_attribute *attr, char *buf) |
2534 | { | 2534 | { |
2535 | return sprintf(buf, "%d\n", loglevel); | 2535 | return sprintf(buf, "%d\n", loglevel); |
2536 | } | 2536 | } |
2537 | 2537 | ||
2538 | static ssize_t | 2538 | static ssize_t |
2539 | loglevel_write(struct device *dev, const char *buf, size_t count) | 2539 | loglevel_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
2540 | { | 2540 | { |
2541 | int ll1; | 2541 | int ll1; |
2542 | 2542 | ||
@@ -2589,7 +2589,7 @@ ctc_print_statistics(struct ctc_priv *priv) | |||
2589 | } | 2589 | } |
2590 | 2590 | ||
2591 | static ssize_t | 2591 | static ssize_t |
2592 | stats_show(struct device *dev, char *buf) | 2592 | stats_show(struct device *dev, struct device_attribute *attr, char *buf) |
2593 | { | 2593 | { |
2594 | struct ctc_priv *priv = dev->driver_data; | 2594 | struct ctc_priv *priv = dev->driver_data; |
2595 | if (!priv) | 2595 | if (!priv) |
@@ -2599,7 +2599,7 @@ stats_show(struct device *dev, char *buf) | |||
2599 | } | 2599 | } |
2600 | 2600 | ||
2601 | static ssize_t | 2601 | static ssize_t |
2602 | stats_write(struct device *dev, const char *buf, size_t count) | 2602 | stats_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
2603 | { | 2603 | { |
2604 | struct ctc_priv *priv = dev->driver_data; | 2604 | struct ctc_priv *priv = dev->driver_data; |
2605 | if (!priv) | 2605 | if (!priv) |
@@ -2654,7 +2654,7 @@ ctc_free_netdevice(struct net_device * dev, int free_dev) | |||
2654 | } | 2654 | } |
2655 | 2655 | ||
2656 | static ssize_t | 2656 | static ssize_t |
2657 | ctc_proto_show(struct device *dev, char *buf) | 2657 | ctc_proto_show(struct device *dev, struct device_attribute *attr, char *buf) |
2658 | { | 2658 | { |
2659 | struct ctc_priv *priv; | 2659 | struct ctc_priv *priv; |
2660 | 2660 | ||
@@ -2666,7 +2666,7 @@ ctc_proto_show(struct device *dev, char *buf) | |||
2666 | } | 2666 | } |
2667 | 2667 | ||
2668 | static ssize_t | 2668 | static ssize_t |
2669 | ctc_proto_store(struct device *dev, const char *buf, size_t count) | 2669 | ctc_proto_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
2670 | { | 2670 | { |
2671 | struct ctc_priv *priv; | 2671 | struct ctc_priv *priv; |
2672 | int value; | 2672 | int value; |
@@ -2687,7 +2687,7 @@ ctc_proto_store(struct device *dev, const char *buf, size_t count) | |||
2687 | 2687 | ||
2688 | 2688 | ||
2689 | static ssize_t | 2689 | static ssize_t |
2690 | ctc_type_show(struct device *dev, char *buf) | 2690 | ctc_type_show(struct device *dev, struct device_attribute *attr, char *buf) |
2691 | { | 2691 | { |
2692 | struct ccwgroup_device *cgdev; | 2692 | struct ccwgroup_device *cgdev; |
2693 | 2693 | ||
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index cccfed248e70..ab086242d305 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1984,7 +1984,7 @@ lcs_open_device(struct net_device *dev) | |||
1984 | * show function for portno called by cat or similar things | 1984 | * show function for portno called by cat or similar things |
1985 | */ | 1985 | */ |
1986 | static ssize_t | 1986 | static ssize_t |
1987 | lcs_portno_show (struct device *dev, char *buf) | 1987 | lcs_portno_show (struct device *dev, struct device_attribute *attr, char *buf) |
1988 | { | 1988 | { |
1989 | struct lcs_card *card; | 1989 | struct lcs_card *card; |
1990 | 1990 | ||
@@ -2000,7 +2000,7 @@ lcs_portno_show (struct device *dev, char *buf) | |||
2000 | * store the value which is piped to file portno | 2000 | * store the value which is piped to file portno |
2001 | */ | 2001 | */ |
2002 | static ssize_t | 2002 | static ssize_t |
2003 | lcs_portno_store (struct device *dev, const char *buf, size_t count) | 2003 | lcs_portno_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
2004 | { | 2004 | { |
2005 | struct lcs_card *card; | 2005 | struct lcs_card *card; |
2006 | int value; | 2006 | int value; |
@@ -2021,7 +2021,7 @@ lcs_portno_store (struct device *dev, const char *buf, size_t count) | |||
2021 | static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store); | 2021 | static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store); |
2022 | 2022 | ||
2023 | static ssize_t | 2023 | static ssize_t |
2024 | lcs_type_show(struct device *dev, char *buf) | 2024 | lcs_type_show(struct device *dev, struct device_attribute *attr, char *buf) |
2025 | { | 2025 | { |
2026 | struct ccwgroup_device *cgdev; | 2026 | struct ccwgroup_device *cgdev; |
2027 | 2027 | ||
@@ -2035,7 +2035,7 @@ lcs_type_show(struct device *dev, char *buf) | |||
2035 | static DEVICE_ATTR(type, 0444, lcs_type_show, NULL); | 2035 | static DEVICE_ATTR(type, 0444, lcs_type_show, NULL); |
2036 | 2036 | ||
2037 | static ssize_t | 2037 | static ssize_t |
2038 | lcs_timeout_show(struct device *dev, char *buf) | 2038 | lcs_timeout_show(struct device *dev, struct device_attribute *attr, char *buf) |
2039 | { | 2039 | { |
2040 | struct lcs_card *card; | 2040 | struct lcs_card *card; |
2041 | 2041 | ||
@@ -2045,7 +2045,7 @@ lcs_timeout_show(struct device *dev, char *buf) | |||
2045 | } | 2045 | } |
2046 | 2046 | ||
2047 | static ssize_t | 2047 | static ssize_t |
2048 | lcs_timeout_store (struct device *dev, const char *buf, size_t count) | 2048 | lcs_timeout_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
2049 | { | 2049 | { |
2050 | struct lcs_card *card; | 2050 | struct lcs_card *card; |
2051 | int value; | 2051 | int value; |
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 16e8e69afb10..3fd4fb754b2d 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -1356,7 +1356,7 @@ netiucv_change_mtu (struct net_device * dev, int new_mtu) | |||
1356 | *****************************************************************************/ | 1356 | *****************************************************************************/ |
1357 | 1357 | ||
1358 | static ssize_t | 1358 | static ssize_t |
1359 | user_show (struct device *dev, char *buf) | 1359 | user_show (struct device *dev, struct device_attribute *attr, char *buf) |
1360 | { | 1360 | { |
1361 | struct netiucv_priv *priv = dev->driver_data; | 1361 | struct netiucv_priv *priv = dev->driver_data; |
1362 | 1362 | ||
@@ -1365,7 +1365,7 @@ user_show (struct device *dev, char *buf) | |||
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | static ssize_t | 1367 | static ssize_t |
1368 | user_write (struct device *dev, const char *buf, size_t count) | 1368 | user_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1369 | { | 1369 | { |
1370 | struct netiucv_priv *priv = dev->driver_data; | 1370 | struct netiucv_priv *priv = dev->driver_data; |
1371 | struct net_device *ndev = priv->conn->netdev; | 1371 | struct net_device *ndev = priv->conn->netdev; |
@@ -1422,7 +1422,7 @@ user_write (struct device *dev, const char *buf, size_t count) | |||
1422 | static DEVICE_ATTR(user, 0644, user_show, user_write); | 1422 | static DEVICE_ATTR(user, 0644, user_show, user_write); |
1423 | 1423 | ||
1424 | static ssize_t | 1424 | static ssize_t |
1425 | buffer_show (struct device *dev, char *buf) | 1425 | buffer_show (struct device *dev, struct device_attribute *attr, char *buf) |
1426 | { | 1426 | { |
1427 | struct netiucv_priv *priv = dev->driver_data; | 1427 | struct netiucv_priv *priv = dev->driver_data; |
1428 | 1428 | ||
@@ -1431,7 +1431,7 @@ buffer_show (struct device *dev, char *buf) | |||
1431 | } | 1431 | } |
1432 | 1432 | ||
1433 | static ssize_t | 1433 | static ssize_t |
1434 | buffer_write (struct device *dev, const char *buf, size_t count) | 1434 | buffer_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1435 | { | 1435 | { |
1436 | struct netiucv_priv *priv = dev->driver_data; | 1436 | struct netiucv_priv *priv = dev->driver_data; |
1437 | struct net_device *ndev = priv->conn->netdev; | 1437 | struct net_device *ndev = priv->conn->netdev; |
@@ -1486,7 +1486,7 @@ buffer_write (struct device *dev, const char *buf, size_t count) | |||
1486 | static DEVICE_ATTR(buffer, 0644, buffer_show, buffer_write); | 1486 | static DEVICE_ATTR(buffer, 0644, buffer_show, buffer_write); |
1487 | 1487 | ||
1488 | static ssize_t | 1488 | static ssize_t |
1489 | dev_fsm_show (struct device *dev, char *buf) | 1489 | dev_fsm_show (struct device *dev, struct device_attribute *attr, char *buf) |
1490 | { | 1490 | { |
1491 | struct netiucv_priv *priv = dev->driver_data; | 1491 | struct netiucv_priv *priv = dev->driver_data; |
1492 | 1492 | ||
@@ -1497,7 +1497,7 @@ dev_fsm_show (struct device *dev, char *buf) | |||
1497 | static DEVICE_ATTR(device_fsm_state, 0444, dev_fsm_show, NULL); | 1497 | static DEVICE_ATTR(device_fsm_state, 0444, dev_fsm_show, NULL); |
1498 | 1498 | ||
1499 | static ssize_t | 1499 | static ssize_t |
1500 | conn_fsm_show (struct device *dev, char *buf) | 1500 | conn_fsm_show (struct device *dev, struct device_attribute *attr, char *buf) |
1501 | { | 1501 | { |
1502 | struct netiucv_priv *priv = dev->driver_data; | 1502 | struct netiucv_priv *priv = dev->driver_data; |
1503 | 1503 | ||
@@ -1508,7 +1508,7 @@ conn_fsm_show (struct device *dev, char *buf) | |||
1508 | static DEVICE_ATTR(connection_fsm_state, 0444, conn_fsm_show, NULL); | 1508 | static DEVICE_ATTR(connection_fsm_state, 0444, conn_fsm_show, NULL); |
1509 | 1509 | ||
1510 | static ssize_t | 1510 | static ssize_t |
1511 | maxmulti_show (struct device *dev, char *buf) | 1511 | maxmulti_show (struct device *dev, struct device_attribute *attr, char *buf) |
1512 | { | 1512 | { |
1513 | struct netiucv_priv *priv = dev->driver_data; | 1513 | struct netiucv_priv *priv = dev->driver_data; |
1514 | 1514 | ||
@@ -1517,7 +1517,7 @@ maxmulti_show (struct device *dev, char *buf) | |||
1517 | } | 1517 | } |
1518 | 1518 | ||
1519 | static ssize_t | 1519 | static ssize_t |
1520 | maxmulti_write (struct device *dev, const char *buf, size_t count) | 1520 | maxmulti_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1521 | { | 1521 | { |
1522 | struct netiucv_priv *priv = dev->driver_data; | 1522 | struct netiucv_priv *priv = dev->driver_data; |
1523 | 1523 | ||
@@ -1529,7 +1529,7 @@ maxmulti_write (struct device *dev, const char *buf, size_t count) | |||
1529 | static DEVICE_ATTR(max_tx_buffer_used, 0644, maxmulti_show, maxmulti_write); | 1529 | static DEVICE_ATTR(max_tx_buffer_used, 0644, maxmulti_show, maxmulti_write); |
1530 | 1530 | ||
1531 | static ssize_t | 1531 | static ssize_t |
1532 | maxcq_show (struct device *dev, char *buf) | 1532 | maxcq_show (struct device *dev, struct device_attribute *attr, char *buf) |
1533 | { | 1533 | { |
1534 | struct netiucv_priv *priv = dev->driver_data; | 1534 | struct netiucv_priv *priv = dev->driver_data; |
1535 | 1535 | ||
@@ -1538,7 +1538,7 @@ maxcq_show (struct device *dev, char *buf) | |||
1538 | } | 1538 | } |
1539 | 1539 | ||
1540 | static ssize_t | 1540 | static ssize_t |
1541 | maxcq_write (struct device *dev, const char *buf, size_t count) | 1541 | maxcq_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1542 | { | 1542 | { |
1543 | struct netiucv_priv *priv = dev->driver_data; | 1543 | struct netiucv_priv *priv = dev->driver_data; |
1544 | 1544 | ||
@@ -1550,7 +1550,7 @@ maxcq_write (struct device *dev, const char *buf, size_t count) | |||
1550 | static DEVICE_ATTR(max_chained_skbs, 0644, maxcq_show, maxcq_write); | 1550 | static DEVICE_ATTR(max_chained_skbs, 0644, maxcq_show, maxcq_write); |
1551 | 1551 | ||
1552 | static ssize_t | 1552 | static ssize_t |
1553 | sdoio_show (struct device *dev, char *buf) | 1553 | sdoio_show (struct device *dev, struct device_attribute *attr, char *buf) |
1554 | { | 1554 | { |
1555 | struct netiucv_priv *priv = dev->driver_data; | 1555 | struct netiucv_priv *priv = dev->driver_data; |
1556 | 1556 | ||
@@ -1559,7 +1559,7 @@ sdoio_show (struct device *dev, char *buf) | |||
1559 | } | 1559 | } |
1560 | 1560 | ||
1561 | static ssize_t | 1561 | static ssize_t |
1562 | sdoio_write (struct device *dev, const char *buf, size_t count) | 1562 | sdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1563 | { | 1563 | { |
1564 | struct netiucv_priv *priv = dev->driver_data; | 1564 | struct netiucv_priv *priv = dev->driver_data; |
1565 | 1565 | ||
@@ -1571,7 +1571,7 @@ sdoio_write (struct device *dev, const char *buf, size_t count) | |||
1571 | static DEVICE_ATTR(tx_single_write_ops, 0644, sdoio_show, sdoio_write); | 1571 | static DEVICE_ATTR(tx_single_write_ops, 0644, sdoio_show, sdoio_write); |
1572 | 1572 | ||
1573 | static ssize_t | 1573 | static ssize_t |
1574 | mdoio_show (struct device *dev, char *buf) | 1574 | mdoio_show (struct device *dev, struct device_attribute *attr, char *buf) |
1575 | { | 1575 | { |
1576 | struct netiucv_priv *priv = dev->driver_data; | 1576 | struct netiucv_priv *priv = dev->driver_data; |
1577 | 1577 | ||
@@ -1580,7 +1580,7 @@ mdoio_show (struct device *dev, char *buf) | |||
1580 | } | 1580 | } |
1581 | 1581 | ||
1582 | static ssize_t | 1582 | static ssize_t |
1583 | mdoio_write (struct device *dev, const char *buf, size_t count) | 1583 | mdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1584 | { | 1584 | { |
1585 | struct netiucv_priv *priv = dev->driver_data; | 1585 | struct netiucv_priv *priv = dev->driver_data; |
1586 | 1586 | ||
@@ -1592,7 +1592,7 @@ mdoio_write (struct device *dev, const char *buf, size_t count) | |||
1592 | static DEVICE_ATTR(tx_multi_write_ops, 0644, mdoio_show, mdoio_write); | 1592 | static DEVICE_ATTR(tx_multi_write_ops, 0644, mdoio_show, mdoio_write); |
1593 | 1593 | ||
1594 | static ssize_t | 1594 | static ssize_t |
1595 | txlen_show (struct device *dev, char *buf) | 1595 | txlen_show (struct device *dev, struct device_attribute *attr, char *buf) |
1596 | { | 1596 | { |
1597 | struct netiucv_priv *priv = dev->driver_data; | 1597 | struct netiucv_priv *priv = dev->driver_data; |
1598 | 1598 | ||
@@ -1601,7 +1601,7 @@ txlen_show (struct device *dev, char *buf) | |||
1601 | } | 1601 | } |
1602 | 1602 | ||
1603 | static ssize_t | 1603 | static ssize_t |
1604 | txlen_write (struct device *dev, const char *buf, size_t count) | 1604 | txlen_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1605 | { | 1605 | { |
1606 | struct netiucv_priv *priv = dev->driver_data; | 1606 | struct netiucv_priv *priv = dev->driver_data; |
1607 | 1607 | ||
@@ -1613,7 +1613,7 @@ txlen_write (struct device *dev, const char *buf, size_t count) | |||
1613 | static DEVICE_ATTR(netto_bytes, 0644, txlen_show, txlen_write); | 1613 | static DEVICE_ATTR(netto_bytes, 0644, txlen_show, txlen_write); |
1614 | 1614 | ||
1615 | static ssize_t | 1615 | static ssize_t |
1616 | txtime_show (struct device *dev, char *buf) | 1616 | txtime_show (struct device *dev, struct device_attribute *attr, char *buf) |
1617 | { | 1617 | { |
1618 | struct netiucv_priv *priv = dev->driver_data; | 1618 | struct netiucv_priv *priv = dev->driver_data; |
1619 | 1619 | ||
@@ -1622,7 +1622,7 @@ txtime_show (struct device *dev, char *buf) | |||
1622 | } | 1622 | } |
1623 | 1623 | ||
1624 | static ssize_t | 1624 | static ssize_t |
1625 | txtime_write (struct device *dev, const char *buf, size_t count) | 1625 | txtime_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1626 | { | 1626 | { |
1627 | struct netiucv_priv *priv = dev->driver_data; | 1627 | struct netiucv_priv *priv = dev->driver_data; |
1628 | 1628 | ||
@@ -1634,7 +1634,7 @@ txtime_write (struct device *dev, const char *buf, size_t count) | |||
1634 | static DEVICE_ATTR(max_tx_io_time, 0644, txtime_show, txtime_write); | 1634 | static DEVICE_ATTR(max_tx_io_time, 0644, txtime_show, txtime_write); |
1635 | 1635 | ||
1636 | static ssize_t | 1636 | static ssize_t |
1637 | txpend_show (struct device *dev, char *buf) | 1637 | txpend_show (struct device *dev, struct device_attribute *attr, char *buf) |
1638 | { | 1638 | { |
1639 | struct netiucv_priv *priv = dev->driver_data; | 1639 | struct netiucv_priv *priv = dev->driver_data; |
1640 | 1640 | ||
@@ -1643,7 +1643,7 @@ txpend_show (struct device *dev, char *buf) | |||
1643 | } | 1643 | } |
1644 | 1644 | ||
1645 | static ssize_t | 1645 | static ssize_t |
1646 | txpend_write (struct device *dev, const char *buf, size_t count) | 1646 | txpend_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1647 | { | 1647 | { |
1648 | struct netiucv_priv *priv = dev->driver_data; | 1648 | struct netiucv_priv *priv = dev->driver_data; |
1649 | 1649 | ||
@@ -1655,7 +1655,7 @@ txpend_write (struct device *dev, const char *buf, size_t count) | |||
1655 | static DEVICE_ATTR(tx_pending, 0644, txpend_show, txpend_write); | 1655 | static DEVICE_ATTR(tx_pending, 0644, txpend_show, txpend_write); |
1656 | 1656 | ||
1657 | static ssize_t | 1657 | static ssize_t |
1658 | txmpnd_show (struct device *dev, char *buf) | 1658 | txmpnd_show (struct device *dev, struct device_attribute *attr, char *buf) |
1659 | { | 1659 | { |
1660 | struct netiucv_priv *priv = dev->driver_data; | 1660 | struct netiucv_priv *priv = dev->driver_data; |
1661 | 1661 | ||
@@ -1664,7 +1664,7 @@ txmpnd_show (struct device *dev, char *buf) | |||
1664 | } | 1664 | } |
1665 | 1665 | ||
1666 | static ssize_t | 1666 | static ssize_t |
1667 | txmpnd_write (struct device *dev, const char *buf, size_t count) | 1667 | txmpnd_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1668 | { | 1668 | { |
1669 | struct netiucv_priv *priv = dev->driver_data; | 1669 | struct netiucv_priv *priv = dev->driver_data; |
1670 | 1670 | ||
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c index 240348398211..98bedb0cb387 100644 --- a/drivers/s390/net/qeth_sys.c +++ b/drivers/s390/net/qeth_sys.c | |||
@@ -30,7 +30,7 @@ const char *VERSION_QETH_SYS_C = "$Revision: 1.51 $"; | |||
30 | //low/high watermark | 30 | //low/high watermark |
31 | 31 | ||
32 | static ssize_t | 32 | static ssize_t |
33 | qeth_dev_state_show(struct device *dev, char *buf) | 33 | qeth_dev_state_show(struct device *dev, struct device_attribute *attr, char *buf) |
34 | { | 34 | { |
35 | struct qeth_card *card = dev->driver_data; | 35 | struct qeth_card *card = dev->driver_data; |
36 | if (!card) | 36 | if (!card) |
@@ -58,7 +58,7 @@ qeth_dev_state_show(struct device *dev, char *buf) | |||
58 | static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL); | 58 | static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL); |
59 | 59 | ||
60 | static ssize_t | 60 | static ssize_t |
61 | qeth_dev_chpid_show(struct device *dev, char *buf) | 61 | qeth_dev_chpid_show(struct device *dev, struct device_attribute *attr, char *buf) |
62 | { | 62 | { |
63 | struct qeth_card *card = dev->driver_data; | 63 | struct qeth_card *card = dev->driver_data; |
64 | if (!card) | 64 | if (!card) |
@@ -70,7 +70,7 @@ qeth_dev_chpid_show(struct device *dev, char *buf) | |||
70 | static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL); | 70 | static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL); |
71 | 71 | ||
72 | static ssize_t | 72 | static ssize_t |
73 | qeth_dev_if_name_show(struct device *dev, char *buf) | 73 | qeth_dev_if_name_show(struct device *dev, struct device_attribute *attr, char *buf) |
74 | { | 74 | { |
75 | struct qeth_card *card = dev->driver_data; | 75 | struct qeth_card *card = dev->driver_data; |
76 | if (!card) | 76 | if (!card) |
@@ -81,7 +81,7 @@ qeth_dev_if_name_show(struct device *dev, char *buf) | |||
81 | static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL); | 81 | static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL); |
82 | 82 | ||
83 | static ssize_t | 83 | static ssize_t |
84 | qeth_dev_card_type_show(struct device *dev, char *buf) | 84 | qeth_dev_card_type_show(struct device *dev, struct device_attribute *attr, char *buf) |
85 | { | 85 | { |
86 | struct qeth_card *card = dev->driver_data; | 86 | struct qeth_card *card = dev->driver_data; |
87 | if (!card) | 87 | if (!card) |
@@ -93,7 +93,7 @@ qeth_dev_card_type_show(struct device *dev, char *buf) | |||
93 | static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL); | 93 | static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL); |
94 | 94 | ||
95 | static ssize_t | 95 | static ssize_t |
96 | qeth_dev_portno_show(struct device *dev, char *buf) | 96 | qeth_dev_portno_show(struct device *dev, struct device_attribute *attr, char *buf) |
97 | { | 97 | { |
98 | struct qeth_card *card = dev->driver_data; | 98 | struct qeth_card *card = dev->driver_data; |
99 | if (!card) | 99 | if (!card) |
@@ -103,7 +103,7 @@ qeth_dev_portno_show(struct device *dev, char *buf) | |||
103 | } | 103 | } |
104 | 104 | ||
105 | static ssize_t | 105 | static ssize_t |
106 | qeth_dev_portno_store(struct device *dev, const char *buf, size_t count) | 106 | qeth_dev_portno_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
107 | { | 107 | { |
108 | struct qeth_card *card = dev->driver_data; | 108 | struct qeth_card *card = dev->driver_data; |
109 | char *tmp; | 109 | char *tmp; |
@@ -129,7 +129,7 @@ qeth_dev_portno_store(struct device *dev, const char *buf, size_t count) | |||
129 | static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store); | 129 | static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store); |
130 | 130 | ||
131 | static ssize_t | 131 | static ssize_t |
132 | qeth_dev_portname_show(struct device *dev, char *buf) | 132 | qeth_dev_portname_show(struct device *dev, struct device_attribute *attr, char *buf) |
133 | { | 133 | { |
134 | struct qeth_card *card = dev->driver_data; | 134 | struct qeth_card *card = dev->driver_data; |
135 | char portname[9] = {0, }; | 135 | char portname[9] = {0, }; |
@@ -146,7 +146,7 @@ qeth_dev_portname_show(struct device *dev, char *buf) | |||
146 | } | 146 | } |
147 | 147 | ||
148 | static ssize_t | 148 | static ssize_t |
149 | qeth_dev_portname_store(struct device *dev, const char *buf, size_t count) | 149 | qeth_dev_portname_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
150 | { | 150 | { |
151 | struct qeth_card *card = dev->driver_data; | 151 | struct qeth_card *card = dev->driver_data; |
152 | char *tmp; | 152 | char *tmp; |
@@ -177,7 +177,7 @@ static DEVICE_ATTR(portname, 0644, qeth_dev_portname_show, | |||
177 | qeth_dev_portname_store); | 177 | qeth_dev_portname_store); |
178 | 178 | ||
179 | static ssize_t | 179 | static ssize_t |
180 | qeth_dev_checksum_show(struct device *dev, char *buf) | 180 | qeth_dev_checksum_show(struct device *dev, struct device_attribute *attr, char *buf) |
181 | { | 181 | { |
182 | struct qeth_card *card = dev->driver_data; | 182 | struct qeth_card *card = dev->driver_data; |
183 | 183 | ||
@@ -188,7 +188,7 @@ qeth_dev_checksum_show(struct device *dev, char *buf) | |||
188 | } | 188 | } |
189 | 189 | ||
190 | static ssize_t | 190 | static ssize_t |
191 | qeth_dev_checksum_store(struct device *dev, const char *buf, size_t count) | 191 | qeth_dev_checksum_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
192 | { | 192 | { |
193 | struct qeth_card *card = dev->driver_data; | 193 | struct qeth_card *card = dev->driver_data; |
194 | char *tmp; | 194 | char *tmp; |
@@ -218,7 +218,7 @@ static DEVICE_ATTR(checksumming, 0644, qeth_dev_checksum_show, | |||
218 | qeth_dev_checksum_store); | 218 | qeth_dev_checksum_store); |
219 | 219 | ||
220 | static ssize_t | 220 | static ssize_t |
221 | qeth_dev_prioqing_show(struct device *dev, char *buf) | 221 | qeth_dev_prioqing_show(struct device *dev, struct device_attribute *attr, char *buf) |
222 | { | 222 | { |
223 | struct qeth_card *card = dev->driver_data; | 223 | struct qeth_card *card = dev->driver_data; |
224 | 224 | ||
@@ -237,7 +237,7 @@ qeth_dev_prioqing_show(struct device *dev, char *buf) | |||
237 | } | 237 | } |
238 | 238 | ||
239 | static ssize_t | 239 | static ssize_t |
240 | qeth_dev_prioqing_store(struct device *dev, const char *buf, size_t count) | 240 | qeth_dev_prioqing_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
241 | { | 241 | { |
242 | struct qeth_card *card = dev->driver_data; | 242 | struct qeth_card *card = dev->driver_data; |
243 | char *tmp; | 243 | char *tmp; |
@@ -290,7 +290,7 @@ static DEVICE_ATTR(priority_queueing, 0644, qeth_dev_prioqing_show, | |||
290 | qeth_dev_prioqing_store); | 290 | qeth_dev_prioqing_store); |
291 | 291 | ||
292 | static ssize_t | 292 | static ssize_t |
293 | qeth_dev_bufcnt_show(struct device *dev, char *buf) | 293 | qeth_dev_bufcnt_show(struct device *dev, struct device_attribute *attr, char *buf) |
294 | { | 294 | { |
295 | struct qeth_card *card = dev->driver_data; | 295 | struct qeth_card *card = dev->driver_data; |
296 | 296 | ||
@@ -301,7 +301,7 @@ qeth_dev_bufcnt_show(struct device *dev, char *buf) | |||
301 | } | 301 | } |
302 | 302 | ||
303 | static ssize_t | 303 | static ssize_t |
304 | qeth_dev_bufcnt_store(struct device *dev, const char *buf, size_t count) | 304 | qeth_dev_bufcnt_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
305 | { | 305 | { |
306 | struct qeth_card *card = dev->driver_data; | 306 | struct qeth_card *card = dev->driver_data; |
307 | char *tmp; | 307 | char *tmp; |
@@ -360,7 +360,7 @@ qeth_dev_route_show(struct qeth_card *card, struct qeth_routing_info *route, | |||
360 | } | 360 | } |
361 | 361 | ||
362 | static ssize_t | 362 | static ssize_t |
363 | qeth_dev_route4_show(struct device *dev, char *buf) | 363 | qeth_dev_route4_show(struct device *dev, struct device_attribute *attr, char *buf) |
364 | { | 364 | { |
365 | struct qeth_card *card = dev->driver_data; | 365 | struct qeth_card *card = dev->driver_data; |
366 | 366 | ||
@@ -410,7 +410,7 @@ qeth_dev_route_store(struct qeth_card *card, struct qeth_routing_info *route, | |||
410 | } | 410 | } |
411 | 411 | ||
412 | static ssize_t | 412 | static ssize_t |
413 | qeth_dev_route4_store(struct device *dev, const char *buf, size_t count) | 413 | qeth_dev_route4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
414 | { | 414 | { |
415 | struct qeth_card *card = dev->driver_data; | 415 | struct qeth_card *card = dev->driver_data; |
416 | 416 | ||
@@ -425,7 +425,7 @@ static DEVICE_ATTR(route4, 0644, qeth_dev_route4_show, qeth_dev_route4_store); | |||
425 | 425 | ||
426 | #ifdef CONFIG_QETH_IPV6 | 426 | #ifdef CONFIG_QETH_IPV6 |
427 | static ssize_t | 427 | static ssize_t |
428 | qeth_dev_route6_show(struct device *dev, char *buf) | 428 | qeth_dev_route6_show(struct device *dev, struct device_attribute *attr, char *buf) |
429 | { | 429 | { |
430 | struct qeth_card *card = dev->driver_data; | 430 | struct qeth_card *card = dev->driver_data; |
431 | 431 | ||
@@ -439,7 +439,7 @@ qeth_dev_route6_show(struct device *dev, char *buf) | |||
439 | } | 439 | } |
440 | 440 | ||
441 | static ssize_t | 441 | static ssize_t |
442 | qeth_dev_route6_store(struct device *dev, const char *buf, size_t count) | 442 | qeth_dev_route6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
443 | { | 443 | { |
444 | struct qeth_card *card = dev->driver_data; | 444 | struct qeth_card *card = dev->driver_data; |
445 | 445 | ||
@@ -461,7 +461,7 @@ static DEVICE_ATTR(route6, 0644, qeth_dev_route6_show, qeth_dev_route6_store); | |||
461 | #endif | 461 | #endif |
462 | 462 | ||
463 | static ssize_t | 463 | static ssize_t |
464 | qeth_dev_add_hhlen_show(struct device *dev, char *buf) | 464 | qeth_dev_add_hhlen_show(struct device *dev, struct device_attribute *attr, char *buf) |
465 | { | 465 | { |
466 | struct qeth_card *card = dev->driver_data; | 466 | struct qeth_card *card = dev->driver_data; |
467 | 467 | ||
@@ -472,7 +472,7 @@ qeth_dev_add_hhlen_show(struct device *dev, char *buf) | |||
472 | } | 472 | } |
473 | 473 | ||
474 | static ssize_t | 474 | static ssize_t |
475 | qeth_dev_add_hhlen_store(struct device *dev, const char *buf, size_t count) | 475 | qeth_dev_add_hhlen_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
476 | { | 476 | { |
477 | struct qeth_card *card = dev->driver_data; | 477 | struct qeth_card *card = dev->driver_data; |
478 | char *tmp; | 478 | char *tmp; |
@@ -499,7 +499,7 @@ static DEVICE_ATTR(add_hhlen, 0644, qeth_dev_add_hhlen_show, | |||
499 | qeth_dev_add_hhlen_store); | 499 | qeth_dev_add_hhlen_store); |
500 | 500 | ||
501 | static ssize_t | 501 | static ssize_t |
502 | qeth_dev_fake_ll_show(struct device *dev, char *buf) | 502 | qeth_dev_fake_ll_show(struct device *dev, struct device_attribute *attr, char *buf) |
503 | { | 503 | { |
504 | struct qeth_card *card = dev->driver_data; | 504 | struct qeth_card *card = dev->driver_data; |
505 | 505 | ||
@@ -510,7 +510,7 @@ qeth_dev_fake_ll_show(struct device *dev, char *buf) | |||
510 | } | 510 | } |
511 | 511 | ||
512 | static ssize_t | 512 | static ssize_t |
513 | qeth_dev_fake_ll_store(struct device *dev, const char *buf, size_t count) | 513 | qeth_dev_fake_ll_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
514 | { | 514 | { |
515 | struct qeth_card *card = dev->driver_data; | 515 | struct qeth_card *card = dev->driver_data; |
516 | char *tmp; | 516 | char *tmp; |
@@ -536,7 +536,7 @@ static DEVICE_ATTR(fake_ll, 0644, qeth_dev_fake_ll_show, | |||
536 | qeth_dev_fake_ll_store); | 536 | qeth_dev_fake_ll_store); |
537 | 537 | ||
538 | static ssize_t | 538 | static ssize_t |
539 | qeth_dev_fake_broadcast_show(struct device *dev, char *buf) | 539 | qeth_dev_fake_broadcast_show(struct device *dev, struct device_attribute *attr, char *buf) |
540 | { | 540 | { |
541 | struct qeth_card *card = dev->driver_data; | 541 | struct qeth_card *card = dev->driver_data; |
542 | 542 | ||
@@ -547,7 +547,7 @@ qeth_dev_fake_broadcast_show(struct device *dev, char *buf) | |||
547 | } | 547 | } |
548 | 548 | ||
549 | static ssize_t | 549 | static ssize_t |
550 | qeth_dev_fake_broadcast_store(struct device *dev, const char *buf, size_t count) | 550 | qeth_dev_fake_broadcast_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
551 | { | 551 | { |
552 | struct qeth_card *card = dev->driver_data; | 552 | struct qeth_card *card = dev->driver_data; |
553 | char *tmp; | 553 | char *tmp; |
@@ -574,7 +574,7 @@ static DEVICE_ATTR(fake_broadcast, 0644, qeth_dev_fake_broadcast_show, | |||
574 | qeth_dev_fake_broadcast_store); | 574 | qeth_dev_fake_broadcast_store); |
575 | 575 | ||
576 | static ssize_t | 576 | static ssize_t |
577 | qeth_dev_recover_store(struct device *dev, const char *buf, size_t count) | 577 | qeth_dev_recover_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
578 | { | 578 | { |
579 | struct qeth_card *card = dev->driver_data; | 579 | struct qeth_card *card = dev->driver_data; |
580 | char *tmp; | 580 | char *tmp; |
@@ -596,7 +596,7 @@ qeth_dev_recover_store(struct device *dev, const char *buf, size_t count) | |||
596 | static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store); | 596 | static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store); |
597 | 597 | ||
598 | static ssize_t | 598 | static ssize_t |
599 | qeth_dev_broadcast_mode_show(struct device *dev, char *buf) | 599 | qeth_dev_broadcast_mode_show(struct device *dev, struct device_attribute *attr, char *buf) |
600 | { | 600 | { |
601 | struct qeth_card *card = dev->driver_data; | 601 | struct qeth_card *card = dev->driver_data; |
602 | 602 | ||
@@ -613,7 +613,7 @@ qeth_dev_broadcast_mode_show(struct device *dev, char *buf) | |||
613 | } | 613 | } |
614 | 614 | ||
615 | static ssize_t | 615 | static ssize_t |
616 | qeth_dev_broadcast_mode_store(struct device *dev, const char *buf, size_t count) | 616 | qeth_dev_broadcast_mode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
617 | { | 617 | { |
618 | struct qeth_card *card = dev->driver_data; | 618 | struct qeth_card *card = dev->driver_data; |
619 | char *tmp; | 619 | char *tmp; |
@@ -651,7 +651,7 @@ static DEVICE_ATTR(broadcast_mode, 0644, qeth_dev_broadcast_mode_show, | |||
651 | qeth_dev_broadcast_mode_store); | 651 | qeth_dev_broadcast_mode_store); |
652 | 652 | ||
653 | static ssize_t | 653 | static ssize_t |
654 | qeth_dev_canonical_macaddr_show(struct device *dev, char *buf) | 654 | qeth_dev_canonical_macaddr_show(struct device *dev, struct device_attribute *attr, char *buf) |
655 | { | 655 | { |
656 | struct qeth_card *card = dev->driver_data; | 656 | struct qeth_card *card = dev->driver_data; |
657 | 657 | ||
@@ -667,7 +667,7 @@ qeth_dev_canonical_macaddr_show(struct device *dev, char *buf) | |||
667 | } | 667 | } |
668 | 668 | ||
669 | static ssize_t | 669 | static ssize_t |
670 | qeth_dev_canonical_macaddr_store(struct device *dev, const char *buf, | 670 | qeth_dev_canonical_macaddr_store(struct device *dev, struct device_attribute *attr, const char *buf, |
671 | size_t count) | 671 | size_t count) |
672 | { | 672 | { |
673 | struct qeth_card *card = dev->driver_data; | 673 | struct qeth_card *card = dev->driver_data; |
@@ -703,7 +703,7 @@ static DEVICE_ATTR(canonical_macaddr, 0644, qeth_dev_canonical_macaddr_show, | |||
703 | qeth_dev_canonical_macaddr_store); | 703 | qeth_dev_canonical_macaddr_store); |
704 | 704 | ||
705 | static ssize_t | 705 | static ssize_t |
706 | qeth_dev_layer2_show(struct device *dev, char *buf) | 706 | qeth_dev_layer2_show(struct device *dev, struct device_attribute *attr, char *buf) |
707 | { | 707 | { |
708 | struct qeth_card *card = dev->driver_data; | 708 | struct qeth_card *card = dev->driver_data; |
709 | 709 | ||
@@ -714,7 +714,7 @@ qeth_dev_layer2_show(struct device *dev, char *buf) | |||
714 | } | 714 | } |
715 | 715 | ||
716 | static ssize_t | 716 | static ssize_t |
717 | qeth_dev_layer2_store(struct device *dev, const char *buf, size_t count) | 717 | qeth_dev_layer2_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
718 | { | 718 | { |
719 | struct qeth_card *card = dev->driver_data; | 719 | struct qeth_card *card = dev->driver_data; |
720 | char *tmp; | 720 | char *tmp; |
@@ -742,7 +742,7 @@ static DEVICE_ATTR(layer2, 0644, qeth_dev_layer2_show, | |||
742 | qeth_dev_layer2_store); | 742 | qeth_dev_layer2_store); |
743 | 743 | ||
744 | static ssize_t | 744 | static ssize_t |
745 | qeth_dev_large_send_show(struct device *dev, char *buf) | 745 | qeth_dev_large_send_show(struct device *dev, struct device_attribute *attr, char *buf) |
746 | { | 746 | { |
747 | struct qeth_card *card = dev->driver_data; | 747 | struct qeth_card *card = dev->driver_data; |
748 | 748 | ||
@@ -762,7 +762,7 @@ qeth_dev_large_send_show(struct device *dev, char *buf) | |||
762 | } | 762 | } |
763 | 763 | ||
764 | static ssize_t | 764 | static ssize_t |
765 | qeth_dev_large_send_store(struct device *dev, const char *buf, size_t count) | 765 | qeth_dev_large_send_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
766 | { | 766 | { |
767 | struct qeth_card *card = dev->driver_data; | 767 | struct qeth_card *card = dev->driver_data; |
768 | enum qeth_large_send_types type; | 768 | enum qeth_large_send_types type; |
@@ -832,7 +832,7 @@ qeth_dev_blkt_store(struct qeth_card *card, const char *buf, size_t count, | |||
832 | } | 832 | } |
833 | 833 | ||
834 | static ssize_t | 834 | static ssize_t |
835 | qeth_dev_blkt_total_show(struct device *dev, char *buf) | 835 | qeth_dev_blkt_total_show(struct device *dev, struct device_attribute *attr, char *buf) |
836 | { | 836 | { |
837 | struct qeth_card *card = dev->driver_data; | 837 | struct qeth_card *card = dev->driver_data; |
838 | 838 | ||
@@ -841,7 +841,7 @@ qeth_dev_blkt_total_show(struct device *dev, char *buf) | |||
841 | 841 | ||
842 | 842 | ||
843 | static ssize_t | 843 | static ssize_t |
844 | qeth_dev_blkt_total_store(struct device *dev, const char *buf, size_t count) | 844 | qeth_dev_blkt_total_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
845 | { | 845 | { |
846 | struct qeth_card *card = dev->driver_data; | 846 | struct qeth_card *card = dev->driver_data; |
847 | 847 | ||
@@ -855,7 +855,7 @@ static DEVICE_ATTR(total, 0644, qeth_dev_blkt_total_show, | |||
855 | qeth_dev_blkt_total_store); | 855 | qeth_dev_blkt_total_store); |
856 | 856 | ||
857 | static ssize_t | 857 | static ssize_t |
858 | qeth_dev_blkt_inter_show(struct device *dev, char *buf) | 858 | qeth_dev_blkt_inter_show(struct device *dev, struct device_attribute *attr, char *buf) |
859 | { | 859 | { |
860 | struct qeth_card *card = dev->driver_data; | 860 | struct qeth_card *card = dev->driver_data; |
861 | 861 | ||
@@ -864,7 +864,7 @@ qeth_dev_blkt_inter_show(struct device *dev, char *buf) | |||
864 | 864 | ||
865 | 865 | ||
866 | static ssize_t | 866 | static ssize_t |
867 | qeth_dev_blkt_inter_store(struct device *dev, const char *buf, size_t count) | 867 | qeth_dev_blkt_inter_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
868 | { | 868 | { |
869 | struct qeth_card *card = dev->driver_data; | 869 | struct qeth_card *card = dev->driver_data; |
870 | 870 | ||
@@ -876,7 +876,7 @@ static DEVICE_ATTR(inter, 0644, qeth_dev_blkt_inter_show, | |||
876 | qeth_dev_blkt_inter_store); | 876 | qeth_dev_blkt_inter_store); |
877 | 877 | ||
878 | static ssize_t | 878 | static ssize_t |
879 | qeth_dev_blkt_inter_jumbo_show(struct device *dev, char *buf) | 879 | qeth_dev_blkt_inter_jumbo_show(struct device *dev, struct device_attribute *attr, char *buf) |
880 | { | 880 | { |
881 | struct qeth_card *card = dev->driver_data; | 881 | struct qeth_card *card = dev->driver_data; |
882 | 882 | ||
@@ -886,7 +886,7 @@ qeth_dev_blkt_inter_jumbo_show(struct device *dev, char *buf) | |||
886 | 886 | ||
887 | 887 | ||
888 | static ssize_t | 888 | static ssize_t |
889 | qeth_dev_blkt_inter_jumbo_store(struct device *dev, const char *buf, size_t count) | 889 | qeth_dev_blkt_inter_jumbo_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
890 | { | 890 | { |
891 | struct qeth_card *card = dev->driver_data; | 891 | struct qeth_card *card = dev->driver_data; |
892 | 892 | ||
@@ -956,7 +956,7 @@ qeth_check_layer2(struct qeth_card *card) | |||
956 | 956 | ||
957 | 957 | ||
958 | static ssize_t | 958 | static ssize_t |
959 | qeth_dev_ipato_enable_show(struct device *dev, char *buf) | 959 | qeth_dev_ipato_enable_show(struct device *dev, struct device_attribute *attr, char *buf) |
960 | { | 960 | { |
961 | struct qeth_card *card = dev->driver_data; | 961 | struct qeth_card *card = dev->driver_data; |
962 | 962 | ||
@@ -969,7 +969,7 @@ qeth_dev_ipato_enable_show(struct device *dev, char *buf) | |||
969 | } | 969 | } |
970 | 970 | ||
971 | static ssize_t | 971 | static ssize_t |
972 | qeth_dev_ipato_enable_store(struct device *dev, const char *buf, size_t count) | 972 | qeth_dev_ipato_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
973 | { | 973 | { |
974 | struct qeth_card *card = dev->driver_data; | 974 | struct qeth_card *card = dev->driver_data; |
975 | char *tmp; | 975 | char *tmp; |
@@ -1004,7 +1004,7 @@ static QETH_DEVICE_ATTR(ipato_enable, enable, 0644, | |||
1004 | qeth_dev_ipato_enable_store); | 1004 | qeth_dev_ipato_enable_store); |
1005 | 1005 | ||
1006 | static ssize_t | 1006 | static ssize_t |
1007 | qeth_dev_ipato_invert4_show(struct device *dev, char *buf) | 1007 | qeth_dev_ipato_invert4_show(struct device *dev, struct device_attribute *attr, char *buf) |
1008 | { | 1008 | { |
1009 | struct qeth_card *card = dev->driver_data; | 1009 | struct qeth_card *card = dev->driver_data; |
1010 | 1010 | ||
@@ -1018,7 +1018,7 @@ qeth_dev_ipato_invert4_show(struct device *dev, char *buf) | |||
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | static ssize_t | 1020 | static ssize_t |
1021 | qeth_dev_ipato_invert4_store(struct device *dev, const char *buf, size_t count) | 1021 | qeth_dev_ipato_invert4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1022 | { | 1022 | { |
1023 | struct qeth_card *card = dev->driver_data; | 1023 | struct qeth_card *card = dev->driver_data; |
1024 | char *tmp; | 1024 | char *tmp; |
@@ -1084,7 +1084,7 @@ qeth_dev_ipato_add_show(char *buf, struct qeth_card *card, | |||
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | static ssize_t | 1086 | static ssize_t |
1087 | qeth_dev_ipato_add4_show(struct device *dev, char *buf) | 1087 | qeth_dev_ipato_add4_show(struct device *dev, struct device_attribute *attr, char *buf) |
1088 | { | 1088 | { |
1089 | struct qeth_card *card = dev->driver_data; | 1089 | struct qeth_card *card = dev->driver_data; |
1090 | 1090 | ||
@@ -1153,7 +1153,7 @@ qeth_dev_ipato_add_store(const char *buf, size_t count, | |||
1153 | } | 1153 | } |
1154 | 1154 | ||
1155 | static ssize_t | 1155 | static ssize_t |
1156 | qeth_dev_ipato_add4_store(struct device *dev, const char *buf, size_t count) | 1156 | qeth_dev_ipato_add4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1157 | { | 1157 | { |
1158 | struct qeth_card *card = dev->driver_data; | 1158 | struct qeth_card *card = dev->driver_data; |
1159 | 1159 | ||
@@ -1186,7 +1186,7 @@ qeth_dev_ipato_del_store(const char *buf, size_t count, | |||
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | static ssize_t | 1188 | static ssize_t |
1189 | qeth_dev_ipato_del4_store(struct device *dev, const char *buf, size_t count) | 1189 | qeth_dev_ipato_del4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1190 | { | 1190 | { |
1191 | struct qeth_card *card = dev->driver_data; | 1191 | struct qeth_card *card = dev->driver_data; |
1192 | 1192 | ||
@@ -1201,7 +1201,7 @@ static QETH_DEVICE_ATTR(ipato_del4, del4, 0200, NULL, | |||
1201 | 1201 | ||
1202 | #ifdef CONFIG_QETH_IPV6 | 1202 | #ifdef CONFIG_QETH_IPV6 |
1203 | static ssize_t | 1203 | static ssize_t |
1204 | qeth_dev_ipato_invert6_show(struct device *dev, char *buf) | 1204 | qeth_dev_ipato_invert6_show(struct device *dev, struct device_attribute *attr, char *buf) |
1205 | { | 1205 | { |
1206 | struct qeth_card *card = dev->driver_data; | 1206 | struct qeth_card *card = dev->driver_data; |
1207 | 1207 | ||
@@ -1215,7 +1215,7 @@ qeth_dev_ipato_invert6_show(struct device *dev, char *buf) | |||
1215 | } | 1215 | } |
1216 | 1216 | ||
1217 | static ssize_t | 1217 | static ssize_t |
1218 | qeth_dev_ipato_invert6_store(struct device *dev, const char *buf, size_t count) | 1218 | qeth_dev_ipato_invert6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1219 | { | 1219 | { |
1220 | struct qeth_card *card = dev->driver_data; | 1220 | struct qeth_card *card = dev->driver_data; |
1221 | char *tmp; | 1221 | char *tmp; |
@@ -1247,7 +1247,7 @@ static QETH_DEVICE_ATTR(ipato_invert6, invert6, 0644, | |||
1247 | 1247 | ||
1248 | 1248 | ||
1249 | static ssize_t | 1249 | static ssize_t |
1250 | qeth_dev_ipato_add6_show(struct device *dev, char *buf) | 1250 | qeth_dev_ipato_add6_show(struct device *dev, struct device_attribute *attr, char *buf) |
1251 | { | 1251 | { |
1252 | struct qeth_card *card = dev->driver_data; | 1252 | struct qeth_card *card = dev->driver_data; |
1253 | 1253 | ||
@@ -1258,7 +1258,7 @@ qeth_dev_ipato_add6_show(struct device *dev, char *buf) | |||
1258 | } | 1258 | } |
1259 | 1259 | ||
1260 | static ssize_t | 1260 | static ssize_t |
1261 | qeth_dev_ipato_add6_store(struct device *dev, const char *buf, size_t count) | 1261 | qeth_dev_ipato_add6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1262 | { | 1262 | { |
1263 | struct qeth_card *card = dev->driver_data; | 1263 | struct qeth_card *card = dev->driver_data; |
1264 | 1264 | ||
@@ -1273,7 +1273,7 @@ static QETH_DEVICE_ATTR(ipato_add6, add6, 0644, | |||
1273 | qeth_dev_ipato_add6_store); | 1273 | qeth_dev_ipato_add6_store); |
1274 | 1274 | ||
1275 | static ssize_t | 1275 | static ssize_t |
1276 | qeth_dev_ipato_del6_store(struct device *dev, const char *buf, size_t count) | 1276 | qeth_dev_ipato_del6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1277 | { | 1277 | { |
1278 | struct qeth_card *card = dev->driver_data; | 1278 | struct qeth_card *card = dev->driver_data; |
1279 | 1279 | ||
@@ -1341,7 +1341,7 @@ qeth_dev_vipa_add_show(char *buf, struct qeth_card *card, | |||
1341 | } | 1341 | } |
1342 | 1342 | ||
1343 | static ssize_t | 1343 | static ssize_t |
1344 | qeth_dev_vipa_add4_show(struct device *dev, char *buf) | 1344 | qeth_dev_vipa_add4_show(struct device *dev, struct device_attribute *attr, char *buf) |
1345 | { | 1345 | { |
1346 | struct qeth_card *card = dev->driver_data; | 1346 | struct qeth_card *card = dev->driver_data; |
1347 | 1347 | ||
@@ -1381,7 +1381,7 @@ qeth_dev_vipa_add_store(const char *buf, size_t count, | |||
1381 | } | 1381 | } |
1382 | 1382 | ||
1383 | static ssize_t | 1383 | static ssize_t |
1384 | qeth_dev_vipa_add4_store(struct device *dev, const char *buf, size_t count) | 1384 | qeth_dev_vipa_add4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1385 | { | 1385 | { |
1386 | struct qeth_card *card = dev->driver_data; | 1386 | struct qeth_card *card = dev->driver_data; |
1387 | 1387 | ||
@@ -1413,7 +1413,7 @@ qeth_dev_vipa_del_store(const char *buf, size_t count, | |||
1413 | } | 1413 | } |
1414 | 1414 | ||
1415 | static ssize_t | 1415 | static ssize_t |
1416 | qeth_dev_vipa_del4_store(struct device *dev, const char *buf, size_t count) | 1416 | qeth_dev_vipa_del4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1417 | { | 1417 | { |
1418 | struct qeth_card *card = dev->driver_data; | 1418 | struct qeth_card *card = dev->driver_data; |
1419 | 1419 | ||
@@ -1428,7 +1428,7 @@ static QETH_DEVICE_ATTR(vipa_del4, del4, 0200, NULL, | |||
1428 | 1428 | ||
1429 | #ifdef CONFIG_QETH_IPV6 | 1429 | #ifdef CONFIG_QETH_IPV6 |
1430 | static ssize_t | 1430 | static ssize_t |
1431 | qeth_dev_vipa_add6_show(struct device *dev, char *buf) | 1431 | qeth_dev_vipa_add6_show(struct device *dev, struct device_attribute *attr, char *buf) |
1432 | { | 1432 | { |
1433 | struct qeth_card *card = dev->driver_data; | 1433 | struct qeth_card *card = dev->driver_data; |
1434 | 1434 | ||
@@ -1439,7 +1439,7 @@ qeth_dev_vipa_add6_show(struct device *dev, char *buf) | |||
1439 | } | 1439 | } |
1440 | 1440 | ||
1441 | static ssize_t | 1441 | static ssize_t |
1442 | qeth_dev_vipa_add6_store(struct device *dev, const char *buf, size_t count) | 1442 | qeth_dev_vipa_add6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1443 | { | 1443 | { |
1444 | struct qeth_card *card = dev->driver_data; | 1444 | struct qeth_card *card = dev->driver_data; |
1445 | 1445 | ||
@@ -1454,7 +1454,7 @@ static QETH_DEVICE_ATTR(vipa_add6, add6, 0644, | |||
1454 | qeth_dev_vipa_add6_store); | 1454 | qeth_dev_vipa_add6_store); |
1455 | 1455 | ||
1456 | static ssize_t | 1456 | static ssize_t |
1457 | qeth_dev_vipa_del6_store(struct device *dev, const char *buf, size_t count) | 1457 | qeth_dev_vipa_del6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1458 | { | 1458 | { |
1459 | struct qeth_card *card = dev->driver_data; | 1459 | struct qeth_card *card = dev->driver_data; |
1460 | 1460 | ||
@@ -1522,7 +1522,7 @@ qeth_dev_rxip_add_show(char *buf, struct qeth_card *card, | |||
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | static ssize_t | 1524 | static ssize_t |
1525 | qeth_dev_rxip_add4_show(struct device *dev, char *buf) | 1525 | qeth_dev_rxip_add4_show(struct device *dev, struct device_attribute *attr, char *buf) |
1526 | { | 1526 | { |
1527 | struct qeth_card *card = dev->driver_data; | 1527 | struct qeth_card *card = dev->driver_data; |
1528 | 1528 | ||
@@ -1562,7 +1562,7 @@ qeth_dev_rxip_add_store(const char *buf, size_t count, | |||
1562 | } | 1562 | } |
1563 | 1563 | ||
1564 | static ssize_t | 1564 | static ssize_t |
1565 | qeth_dev_rxip_add4_store(struct device *dev, const char *buf, size_t count) | 1565 | qeth_dev_rxip_add4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1566 | { | 1566 | { |
1567 | struct qeth_card *card = dev->driver_data; | 1567 | struct qeth_card *card = dev->driver_data; |
1568 | 1568 | ||
@@ -1594,7 +1594,7 @@ qeth_dev_rxip_del_store(const char *buf, size_t count, | |||
1594 | } | 1594 | } |
1595 | 1595 | ||
1596 | static ssize_t | 1596 | static ssize_t |
1597 | qeth_dev_rxip_del4_store(struct device *dev, const char *buf, size_t count) | 1597 | qeth_dev_rxip_del4_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1598 | { | 1598 | { |
1599 | struct qeth_card *card = dev->driver_data; | 1599 | struct qeth_card *card = dev->driver_data; |
1600 | 1600 | ||
@@ -1609,7 +1609,7 @@ static QETH_DEVICE_ATTR(rxip_del4, del4, 0200, NULL, | |||
1609 | 1609 | ||
1610 | #ifdef CONFIG_QETH_IPV6 | 1610 | #ifdef CONFIG_QETH_IPV6 |
1611 | static ssize_t | 1611 | static ssize_t |
1612 | qeth_dev_rxip_add6_show(struct device *dev, char *buf) | 1612 | qeth_dev_rxip_add6_show(struct device *dev, struct device_attribute *attr, char *buf) |
1613 | { | 1613 | { |
1614 | struct qeth_card *card = dev->driver_data; | 1614 | struct qeth_card *card = dev->driver_data; |
1615 | 1615 | ||
@@ -1620,7 +1620,7 @@ qeth_dev_rxip_add6_show(struct device *dev, char *buf) | |||
1620 | } | 1620 | } |
1621 | 1621 | ||
1622 | static ssize_t | 1622 | static ssize_t |
1623 | qeth_dev_rxip_add6_store(struct device *dev, const char *buf, size_t count) | 1623 | qeth_dev_rxip_add6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1624 | { | 1624 | { |
1625 | struct qeth_card *card = dev->driver_data; | 1625 | struct qeth_card *card = dev->driver_data; |
1626 | 1626 | ||
@@ -1635,7 +1635,7 @@ static QETH_DEVICE_ATTR(rxip_add6, add6, 0644, | |||
1635 | qeth_dev_rxip_add6_store); | 1635 | qeth_dev_rxip_add6_store); |
1636 | 1636 | ||
1637 | static ssize_t | 1637 | static ssize_t |
1638 | qeth_dev_rxip_del6_store(struct device *dev, const char *buf, size_t count) | 1638 | qeth_dev_rxip_del6_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1639 | { | 1639 | { |
1640 | struct qeth_card *card = dev->driver_data; | 1640 | struct qeth_card *card = dev->driver_data; |
1641 | 1641 | ||