Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 10523b3b82456e416cbaffcc24ea2246980aa746

Authored by Yani Ioannou
Committed by Greg Kroah-Hartman
1 parent 3fd3c0a5f5
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] Driver Core: drivers/s390/net/qeth_sys.c - drivers/usb/gadget/pxa2xx_udc… 

….c: update device attribute callbacks

Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 17 changed files with 122 additions and 122 deletions Side-by-side Diff

drivers/s390/net/qeth_sys.c
Diff comments   View file @ 10523b3
... ... @@ -30,7 +30,7 @@
30 30 //low/high watermark
31 31  
32 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 35 struct qeth_card *card = dev->driver_data;
36 36 if (!card)
... ... @@ -58,7 +58,7 @@
58 58 static DEVICE_ATTR(state, 0444, qeth_dev_state_show, NULL);
59 59  
60 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 63 struct qeth_card *card = dev->driver_data;
64 64 if (!card)
... ... @@ -70,7 +70,7 @@
70 70 static DEVICE_ATTR(chpid, 0444, qeth_dev_chpid_show, NULL);
71 71  
72 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 75 struct qeth_card *card = dev->driver_data;
76 76 if (!card)
... ... @@ -81,7 +81,7 @@
81 81 static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);
82 82  
83 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 86 struct qeth_card *card = dev->driver_data;
87 87 if (!card)
... ... @@ -93,7 +93,7 @@
93 93 static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);
94 94  
95 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 98 struct qeth_card *card = dev->driver_data;
99 99 if (!card)
... ... @@ -103,7 +103,7 @@
103 103 }
104 104  
105 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 108 struct qeth_card *card = dev->driver_data;
109 109 char *tmp;
... ... @@ -129,7 +129,7 @@
129 129 static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store);
130 130  
131 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 134 struct qeth_card *card = dev->driver_data;
135 135 char portname[9] = {0, };
... ... @@ -146,7 +146,7 @@
146 146 }
147 147  
148 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 151 struct qeth_card *card = dev->driver_data;
152 152 char *tmp;
... ... @@ -177,7 +177,7 @@
177 177 qeth_dev_portname_store);
178 178  
179 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 182 struct qeth_card *card = dev->driver_data;
183 183  
... ... @@ -188,7 +188,7 @@
188 188 }
189 189  
190 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 193 struct qeth_card *card = dev->driver_data;
194 194 char *tmp;
... ... @@ -218,7 +218,7 @@
218 218 qeth_dev_checksum_store);
219 219  
220 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 223 struct qeth_card *card = dev->driver_data;
224 224  
... ... @@ -237,7 +237,7 @@
237 237 }
238 238  
239 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 242 struct qeth_card *card = dev->driver_data;
243 243 char *tmp;
... ... @@ -290,7 +290,7 @@
290 290 qeth_dev_prioqing_store);
291 291  
292 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 295 struct qeth_card *card = dev->driver_data;
296 296  
... ... @@ -301,7 +301,7 @@
301 301 }
302 302  
303 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 306 struct qeth_card *card = dev->driver_data;
307 307 char *tmp;
... ... @@ -360,7 +360,7 @@
360 360 }
361 361  
362 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 365 struct qeth_card *card = dev->driver_data;
366 366  
... ... @@ -410,7 +410,7 @@
410 410 }
411 411  
412 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 415 struct qeth_card *card = dev->driver_data;
416 416  
... ... @@ -425,7 +425,7 @@
425 425  
426 426 #ifdef CONFIG_QETH_IPV6
427 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 430 struct qeth_card *card = dev->driver_data;
431 431  
... ... @@ -439,7 +439,7 @@
439 439 }
440 440  
441 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 444 struct qeth_card *card = dev->driver_data;
445 445  
... ... @@ -461,7 +461,7 @@
461 461 #endif
462 462  
463 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 466 struct qeth_card *card = dev->driver_data;
467 467  
... ... @@ -472,7 +472,7 @@
472 472 }
473 473  
474 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 477 struct qeth_card *card = dev->driver_data;
478 478 char *tmp;
... ... @@ -499,7 +499,7 @@
499 499 qeth_dev_add_hhlen_store);
500 500  
501 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 504 struct qeth_card *card = dev->driver_data;
505 505  
... ... @@ -510,7 +510,7 @@
510 510 }
511 511  
512 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 515 struct qeth_card *card = dev->driver_data;
516 516 char *tmp;
... ... @@ -536,7 +536,7 @@
536 536 qeth_dev_fake_ll_store);
537 537  
538 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 541 struct qeth_card *card = dev->driver_data;
542 542  
... ... @@ -547,7 +547,7 @@
547 547 }
548 548  
549 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 552 struct qeth_card *card = dev->driver_data;
553 553 char *tmp;
... ... @@ -574,7 +574,7 @@
574 574 qeth_dev_fake_broadcast_store);
575 575  
576 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 579 struct qeth_card *card = dev->driver_data;
580 580 char *tmp;
... ... @@ -596,7 +596,7 @@
596 596 static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);
597 597  
598 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 601 struct qeth_card *card = dev->driver_data;
602 602  
... ... @@ -613,7 +613,7 @@
613 613 }
614 614  
615 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 618 struct qeth_card *card = dev->driver_data;
619 619 char *tmp;
... ... @@ -651,7 +651,7 @@
651 651 qeth_dev_broadcast_mode_store);
652 652  
653 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 656 struct qeth_card *card = dev->driver_data;
657 657  
... ... @@ -667,7 +667,7 @@
667 667 }
668 668  
669 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 671 size_t count)
672 672 {
673 673 struct qeth_card *card = dev->driver_data;
... ... @@ -703,7 +703,7 @@
703 703 qeth_dev_canonical_macaddr_store);
704 704  
705 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 708 struct qeth_card *card = dev->driver_data;
709 709  
... ... @@ -714,7 +714,7 @@
714 714 }
715 715  
716 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 719 struct qeth_card *card = dev->driver_data;
720 720 char *tmp;
... ... @@ -742,7 +742,7 @@
742 742 qeth_dev_layer2_store);
743 743  
744 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 747 struct qeth_card *card = dev->driver_data;
748 748  
... ... @@ -762,7 +762,7 @@
762 762 }
763 763  
764 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 767 struct qeth_card *card = dev->driver_data;
768 768 enum qeth_large_send_types type;
... ... @@ -832,7 +832,7 @@
832 832 }
833 833  
834 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 837 struct qeth_card *card = dev->driver_data;
838 838  
... ... @@ -841,7 +841,7 @@
841 841  
842 842  
843 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 846 struct qeth_card *card = dev->driver_data;
847 847  
... ... @@ -855,7 +855,7 @@
855 855 qeth_dev_blkt_total_store);
856 856  
857 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 860 struct qeth_card *card = dev->driver_data;
861 861  
... ... @@ -864,7 +864,7 @@
864 864  
865 865  
866 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 869 struct qeth_card *card = dev->driver_data;
870 870  
... ... @@ -876,7 +876,7 @@
876 876 qeth_dev_blkt_inter_store);
877 877  
878 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 881 struct qeth_card *card = dev->driver_data;
882 882  
... ... @@ -886,7 +886,7 @@
886 886  
887 887  
888 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 891 struct qeth_card *card = dev->driver_data;
892 892  
... ... @@ -956,7 +956,7 @@
956 956  
957 957  
958 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 961 struct qeth_card *card = dev->driver_data;
962 962  
... ... @@ -969,7 +969,7 @@
969 969 }
970 970  
971 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 974 struct qeth_card *card = dev->driver_data;
975 975 char *tmp;
... ... @@ -1004,7 +1004,7 @@
1004 1004 qeth_dev_ipato_enable_store);
1005 1005  
1006 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 1009 struct qeth_card *card = dev->driver_data;
1010 1010  
... ... @@ -1018,7 +1018,7 @@
1018 1018 }
1019 1019  
1020 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 1023 struct qeth_card *card = dev->driver_data;
1024 1024 char *tmp;
... ... @@ -1084,7 +1084,7 @@
1084 1084 }
1085 1085  
1086 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 1089 struct qeth_card *card = dev->driver_data;
1090 1090  
... ... @@ -1153,7 +1153,7 @@
1153 1153 }
1154 1154  
1155 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 1158 struct qeth_card *card = dev->driver_data;
1159 1159  
... ... @@ -1186,7 +1186,7 @@
1186 1186 }
1187 1187  
1188 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 1191 struct qeth_card *card = dev->driver_data;
1192 1192  
... ... @@ -1201,7 +1201,7 @@
1201 1201  
1202 1202 #ifdef CONFIG_QETH_IPV6
1203 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 1206 struct qeth_card *card = dev->driver_data;
1207 1207  
... ... @@ -1215,7 +1215,7 @@
1215 1215 }
1216 1216  
1217 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 1220 struct qeth_card *card = dev->driver_data;
1221 1221 char *tmp;
... ... @@ -1247,7 +1247,7 @@
1247 1247  
1248 1248  
1249 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 1252 struct qeth_card *card = dev->driver_data;
1253 1253  
... ... @@ -1258,7 +1258,7 @@
1258 1258 }
1259 1259  
1260 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 1263 struct qeth_card *card = dev->driver_data;
1264 1264  
... ... @@ -1273,7 +1273,7 @@
1273 1273 qeth_dev_ipato_add6_store);
1274 1274  
1275 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 1278 struct qeth_card *card = dev->driver_data;
1279 1279  
... ... @@ -1341,7 +1341,7 @@
1341 1341 }
1342 1342  
1343 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 1346 struct qeth_card *card = dev->driver_data;
1347 1347  
... ... @@ -1381,7 +1381,7 @@
1381 1381 }
1382 1382  
1383 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 1386 struct qeth_card *card = dev->driver_data;
1387 1387  
... ... @@ -1413,7 +1413,7 @@
1413 1413 }
1414 1414  
1415 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 1418 struct qeth_card *card = dev->driver_data;
1419 1419  
... ... @@ -1428,7 +1428,7 @@
1428 1428  
1429 1429 #ifdef CONFIG_QETH_IPV6
1430 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 1433 struct qeth_card *card = dev->driver_data;
1434 1434  
... ... @@ -1439,7 +1439,7 @@
1439 1439 }
1440 1440  
1441 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 1444 struct qeth_card *card = dev->driver_data;
1445 1445  
... ... @@ -1454,7 +1454,7 @@
1454 1454 qeth_dev_vipa_add6_store);
1455 1455  
1456 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 1459 struct qeth_card *card = dev->driver_data;
1460 1460  
... ... @@ -1522,7 +1522,7 @@
1522 1522 }
1523 1523  
1524 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 1527 struct qeth_card *card = dev->driver_data;
1528 1528  
... ... @@ -1562,7 +1562,7 @@
1562 1562 }
1563 1563  
1564 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 1567 struct qeth_card *card = dev->driver_data;
1568 1568  
... ... @@ -1594,7 +1594,7 @@
1594 1594 }
1595 1595  
1596 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 1599 struct qeth_card *card = dev->driver_data;
1600 1600  
... ... @@ -1609,7 +1609,7 @@
1609 1609  
1610 1610 #ifdef CONFIG_QETH_IPV6
1611 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 1614 struct qeth_card *card = dev->driver_data;
1615 1615  
... ... @@ -1620,7 +1620,7 @@
1620 1620 }
1621 1621  
1622 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 1625 struct qeth_card *card = dev->driver_data;
1626 1626  
... ... @@ -1635,7 +1635,7 @@
1635 1635 qeth_dev_rxip_add6_store);
1636 1636  
1637 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 1640 struct qeth_card *card = dev->driver_data;
1641 1641  
drivers/s390/scsi/zfcp_scsi.c
Diff comments   View file @ 10523b3
... ... @@ -924,7 +924,7 @@
924 924 * Generates attribute for a unit.
925 925 */
926 926 #define ZFCP_DEFINE_SCSI_ATTR(_name, _format, _value) \
927   -static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, \
  927 +static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev, struct device_attribute *attr, \
928 928 char *buf) \
929 929 { \
930 930 struct scsi_device *sdev; \
drivers/s390/scsi/zfcp_sysfs_adapter.c
Diff comments   View file @ 10523b3
... ... @@ -50,7 +50,7 @@
50 50 * Generates attributes for an adapter.
51 51 */
52 52 #define ZFCP_DEFINE_ADAPTER_ATTR(_name, _format, _value) \
53   -static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, \
  53 +static ssize_t zfcp_sysfs_adapter_##_name##_show(struct device *dev, struct device_attribute *attr, \
54 54 char *buf) \
55 55 { \
56 56 struct zfcp_adapter *adapter; \
... ... @@ -90,7 +90,7 @@
90 90 * Store function of the "port_add" attribute of an adapter.
91 91 */
92 92 static ssize_t
93   -zfcp_sysfs_port_add_store(struct device *dev, const char *buf, size_t count)
  93 +zfcp_sysfs_port_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
94 94 {
95 95 wwn_t wwpn;
96 96 char *endp;
... ... @@ -135,7 +135,7 @@
135 135 * Store function of the "port_remove" attribute of an adapter.
136 136 */
137 137 static ssize_t
138   -zfcp_sysfs_port_remove_store(struct device *dev, const char *buf, size_t count)
  138 +zfcp_sysfs_port_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
139 139 {
140 140 struct zfcp_adapter *adapter;
141 141 struct zfcp_port *port;
... ... @@ -196,7 +196,7 @@
196 196 * started for the belonging adapter.
197 197 */
198 198 static ssize_t
199   -zfcp_sysfs_adapter_failed_store(struct device *dev,
  199 +zfcp_sysfs_adapter_failed_store(struct device *dev, struct device_attribute *attr,
200 200 const char *buf, size_t count)
201 201 {
202 202 struct zfcp_adapter *adapter;
... ... @@ -236,7 +236,7 @@
236 236 * "0" if adapter is working, otherwise "1".
237 237 */
238 238 static ssize_t
239   -zfcp_sysfs_adapter_failed_show(struct device *dev, char *buf)
  239 +zfcp_sysfs_adapter_failed_show(struct device *dev, struct device_attribute *attr, char *buf)
240 240 {
241 241 struct zfcp_adapter *adapter;
242 242  
drivers/s390/scsi/zfcp_sysfs_port.c
Diff comments   View file @ 10523b3
... ... @@ -53,7 +53,7 @@
53 53 * Generates attributes for a port.
54 54 */
55 55 #define ZFCP_DEFINE_PORT_ATTR(_name, _format, _value) \
56   -static ssize_t zfcp_sysfs_port_##_name##_show(struct device *dev, \
  56 +static ssize_t zfcp_sysfs_port_##_name##_show(struct device *dev, struct device_attribute *attr, \
57 57 char *buf) \
58 58 { \
59 59 struct zfcp_port *port; \
... ... @@ -82,7 +82,7 @@
82 82 * Store function of the "unit_add" attribute of a port.
83 83 */
84 84 static ssize_t
85   -zfcp_sysfs_unit_add_store(struct device *dev, const char *buf, size_t count)
  85 +zfcp_sysfs_unit_add_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
86 86 {
87 87 fcp_lun_t fcp_lun;
88 88 char *endp;
... ... @@ -125,7 +125,7 @@
125 125 * @count: number of bytes in buffer
126 126 */
127 127 static ssize_t
128   -zfcp_sysfs_unit_remove_store(struct device *dev, const char *buf, size_t count)
  128 +zfcp_sysfs_unit_remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
129 129 {
130 130 struct zfcp_port *port;
131 131 struct zfcp_unit *unit;
... ... @@ -186,7 +186,7 @@
186 186 * started for the belonging port.
187 187 */
188 188 static ssize_t
189   -zfcp_sysfs_port_failed_store(struct device *dev, const char *buf, size_t count)
  189 +zfcp_sysfs_port_failed_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
190 190 {
191 191 struct zfcp_port *port;
192 192 unsigned int val;
... ... @@ -224,7 +224,7 @@
224 224 * "0" if port is working, otherwise "1".
225 225 */
226 226 static ssize_t
227   -zfcp_sysfs_port_failed_show(struct device *dev, char *buf)
  227 +zfcp_sysfs_port_failed_show(struct device *dev, struct device_attribute *attr, char *buf)
228 228 {
229 229 struct zfcp_port *port;
230 230  
drivers/s390/scsi/zfcp_sysfs_unit.c
Diff comments   View file @ 10523b3
... ... @@ -53,7 +53,7 @@
53 53 * Generates attribute for a unit.
54 54 */
55 55 #define ZFCP_DEFINE_UNIT_ATTR(_name, _format, _value) \
56   -static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev, \
  56 +static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev, struct device_attribute *attr, \
57 57 char *buf) \
58 58 { \
59 59 struct zfcp_unit *unit; \
... ... @@ -86,7 +86,7 @@
86 86 * started for the belonging unit.
87 87 */
88 88 static ssize_t
89   -zfcp_sysfs_unit_failed_store(struct device *dev, const char *buf, size_t count)
  89 +zfcp_sysfs_unit_failed_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
90 90 {
91 91 struct zfcp_unit *unit;
92 92 unsigned int val;
... ... @@ -123,7 +123,7 @@
123 123 * "0" if unit is working, otherwise "1".
124 124 */
125 125 static ssize_t
126   -zfcp_sysfs_unit_failed_show(struct device *dev, char *buf)
  126 +zfcp_sysfs_unit_failed_show(struct device *dev, struct device_attribute *attr, char *buf)
127 127 {
128 128 struct zfcp_unit *unit;
129 129  
drivers/scsi/53c700.c
Diff comments   View file @ 10523b3
... ... @@ -2125,7 +2125,7 @@
2125 2125 }
2126 2126  
2127 2127 static ssize_t
2128   -NCR_700_show_active_tags(struct device *dev, char *buf)
  2128 +NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char *buf)
2129 2129 {
2130 2130 struct scsi_device *SDp = to_scsi_device(dev);
2131 2131  
drivers/scsi/arm/eesox.c
Diff comments   View file @ 10523b3
... ... @@ -466,7 +466,7 @@
466 466 return pos;
467 467 }
468 468  
469   -static ssize_t eesoxscsi_show_term(struct device *dev, char *buf)
  469 +static ssize_t eesoxscsi_show_term(struct device *dev, struct device_attribute *attr, char *buf)
470 470 {
471 471 struct expansion_card *ec = ECARD_DEV(dev);
472 472 struct Scsi_Host *host = ecard_get_drvdata(ec);
... ... @@ -475,7 +475,7 @@
475 475 return sprintf(buf, "%d\n", info->control & EESOX_TERM_ENABLE ? 1 : 0);
476 476 }
477 477  
478   -static ssize_t eesoxscsi_store_term(struct device *dev, const char *buf, size_t len)
  478 +static ssize_t eesoxscsi_store_term(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)
479 479 {
480 480 struct expansion_card *ec = ECARD_DEV(dev);
481 481 struct Scsi_Host *host = ecard_get_drvdata(ec);
drivers/scsi/arm/powertec.c
Diff comments   View file @ 10523b3
... ... @@ -269,7 +269,7 @@
269 269 return pos;
270 270 }
271 271  
272   -static ssize_t powertecscsi_show_term(struct device *dev, char *buf)
  272 +static ssize_t powertecscsi_show_term(struct device *dev, struct device_attribute *attr, char *buf)
273 273 {
274 274 struct expansion_card *ec = ECARD_DEV(dev);
275 275 struct Scsi_Host *host = ecard_get_drvdata(ec);
... ... @@ -279,7 +279,7 @@
279 279 }
280 280  
281 281 static ssize_t
282   -powertecscsi_store_term(struct device *dev, const char *buf, size_t len)
  282 +powertecscsi_store_term(struct device *dev, struct device_attribute *attr, const char *buf, size_t len)
283 283 {
284 284 struct expansion_card *ec = ECARD_DEV(dev);
285 285 struct Scsi_Host *host = ecard_get_drvdata(ec);
... ... @@ -2716,7 +2716,7 @@
2716 2716 * Return value:
2717 2717 * number of bytes printed to buffer
2718 2718 **/
2719   -static ssize_t ipr_show_adapter_handle(struct device *dev, char *buf)
  2719 +static ssize_t ipr_show_adapter_handle(struct device *dev, struct device_attribute *attr, char *buf)
2720 2720 {
2721 2721 struct scsi_device *sdev = to_scsi_device(dev);
2722 2722 struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
drivers/scsi/megaraid/megaraid_mbox.c
Diff comments   View file @ 10523b3
... ... @@ -124,7 +124,7 @@
124 124 static void megaraid_mbox_dpc(unsigned long);
125 125  
126 126 static ssize_t megaraid_sysfs_show_app_hndl(struct class_device *, char *);
127   -static ssize_t megaraid_sysfs_show_ldnum(struct device *, char *);
  127 +static ssize_t megaraid_sysfs_show_ldnum(struct device *, struct device_attribute *attr, char *);
128 128  
129 129 static int megaraid_cmm_register(adapter_t *);
130 130 static int megaraid_cmm_unregister(adapter_t *);
... ... @@ -4145,7 +4145,7 @@
4145 4145 * @param buf : buffer to send data to
4146 4146 */
4147 4147 static ssize_t
4148   -megaraid_sysfs_show_ldnum(struct device *dev, char *buf)
  4148 +megaraid_sysfs_show_ldnum(struct device *dev, struct device_attribute *attr, char *buf)
4149 4149 {
4150 4150 struct scsi_device *sdev = to_scsi_device(dev);
4151 4151 adapter_t *adapter = (adapter_t *)SCSIHOST2ADAP(sdev->host);
drivers/scsi/scsi_sysfs.c
Diff comments   View file @ 10523b3
... ... @@ -230,7 +230,7 @@
230 230 */
231 231 #define sdev_show_function(field, format_string) \
232 232 static ssize_t \
233   -sdev_show_##field (struct device *dev, char *buf) \
  233 +sdev_show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
234 234 { \
235 235 struct scsi_device *sdev; \
236 236 sdev = to_scsi_device(dev); \
... ... @@ -254,7 +254,7 @@
254 254 sdev_show_function(field, format_string) \
255 255 \
256 256 static ssize_t \
257   -sdev_store_##field (struct device *dev, const char *buf, size_t count) \
  257 +sdev_store_##field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
258 258 { \
259 259 struct scsi_device *sdev; \
260 260 sdev = to_scsi_device(dev); \
... ... @@ -274,7 +274,7 @@
274 274 sdev_show_function(field, "%d\n") \
275 275 \
276 276 static ssize_t \
277   -sdev_store_##field (struct device *dev, const char *buf, size_t count) \
  277 +sdev_store_##field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \
278 278 { \
279 279 int ret; \
280 280 struct scsi_device *sdev; \
... ... @@ -317,7 +317,7 @@
317 317 sdev_rd_attr (rev, "%.4s\n");
318 318  
319 319 static ssize_t
320   -sdev_show_timeout (struct device *dev, char *buf)
  320 +sdev_show_timeout (struct device *dev, struct device_attribute *attr, char *buf)
321 321 {
322 322 struct scsi_device *sdev;
323 323 sdev = to_scsi_device(dev);
... ... @@ -325,7 +325,7 @@
325 325 }
326 326  
327 327 static ssize_t
328   -sdev_store_timeout (struct device *dev, const char *buf, size_t count)
  328 +sdev_store_timeout (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
329 329 {
330 330 struct scsi_device *sdev;
331 331 int timeout;
332 332  
... ... @@ -337,14 +337,14 @@
337 337 static DEVICE_ATTR(timeout, S_IRUGO | S_IWUSR, sdev_show_timeout, sdev_store_timeout);
338 338  
339 339 static ssize_t
340   -store_rescan_field (struct device *dev, const char *buf, size_t count)
  340 +store_rescan_field (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
341 341 {
342 342 scsi_rescan_device(dev);
343 343 return count;
344 344 }
345 345 static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field);
346 346  
347   -static ssize_t sdev_store_delete(struct device *dev, const char *buf,
  347 +static ssize_t sdev_store_delete(struct device *dev, struct device_attribute *attr, const char *buf,
348 348 size_t count)
349 349 {
350 350 scsi_remove_device(to_scsi_device(dev));
... ... @@ -353,7 +353,7 @@
353 353 static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);
354 354  
355 355 static ssize_t
356   -store_state_field(struct device *dev, const char *buf, size_t count)
  356 +store_state_field(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
357 357 {
358 358 int i;
359 359 struct scsi_device *sdev = to_scsi_device(dev);
... ... @@ -376,7 +376,7 @@
376 376 }
377 377  
378 378 static ssize_t
379   -show_state_field(struct device *dev, char *buf)
  379 +show_state_field(struct device *dev, struct device_attribute *attr, char *buf)
380 380 {
381 381 struct scsi_device *sdev = to_scsi_device(dev);
382 382 const char *name = scsi_device_state_name(sdev->sdev_state);
... ... @@ -390,7 +390,7 @@
390 390 static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_state_field, store_state_field);
391 391  
392 392 static ssize_t
393   -show_queue_type_field(struct device *dev, char *buf)
  393 +show_queue_type_field(struct device *dev, struct device_attribute *attr, char *buf)
394 394 {
395 395 struct scsi_device *sdev = to_scsi_device(dev);
396 396 const char *name = "none";
... ... @@ -406,7 +406,7 @@
406 406 static DEVICE_ATTR(queue_type, S_IRUGO, show_queue_type_field, NULL);
407 407  
408 408 static ssize_t
409   -show_iostat_counterbits(struct device *dev, char *buf)
  409 +show_iostat_counterbits(struct device *dev, struct device_attribute *attr, char *buf)
410 410 {
411 411 return snprintf(buf, 20, "%d\n", (int)sizeof(atomic_t) * 8);
412 412 }
... ... @@ -415,7 +415,7 @@
415 415  
416 416 #define show_sdev_iostat(field) \
417 417 static ssize_t \
418   -show_iostat_##field(struct device *dev, char *buf) \
  418 +show_iostat_##field(struct device *dev, struct device_attribute *attr, char *buf) \
419 419 { \
420 420 struct scsi_device *sdev = to_scsi_device(dev); \
421 421 unsigned long long count = atomic_read(&sdev->field); \
... ... @@ -449,7 +449,7 @@
449 449 NULL
450 450 };
451 451  
452   -static ssize_t sdev_store_queue_depth_rw(struct device *dev, const char *buf,
  452 +static ssize_t sdev_store_queue_depth_rw(struct device *dev, struct device_attribute *attr, const char *buf,
453 453 size_t count)
454 454 {
455 455 int depth, retval;
... ... @@ -475,7 +475,7 @@
475 475 __ATTR(queue_depth, S_IRUGO | S_IWUSR, sdev_show_queue_depth,
476 476 sdev_store_queue_depth_rw);
477 477  
478   -static ssize_t sdev_store_queue_type_rw(struct device *dev, const char *buf,
  478 +static ssize_t sdev_store_queue_type_rw(struct device *dev, struct device_attribute *attr, const char *buf,
479 479 size_t count)
480 480 {
481 481 struct scsi_device *sdev = to_scsi_device(dev);
drivers/sh/superhyway/superhyway-sysfs.c
Diff comments   View file @ 10523b3
... ... @@ -15,7 +15,7 @@
15 15 #include <linux/superhyway.h>
16 16  
17 17 #define superhyway_ro_attr(name, fmt, field) \
18   -static ssize_t name##_show(struct device *dev, char *buf) \
  18 +static ssize_t name##_show(struct device *dev, struct device_attribute *attr, char *buf) \
19 19 { \
20 20 struct superhyway_device *s = to_superhyway_device(dev); \
21 21 return sprintf(buf, fmt, s->field); \
drivers/usb/core/sysfs.c
Diff comments   View file @ 10523b3
... ... @@ -24,7 +24,7 @@
24 24  
25 25 /* Active configuration fields */
26 26 #define usb_actconfig_show(field, multiplier, format_string) \
27   -static ssize_t show_##field (struct device *dev, char *buf) \
  27 +static ssize_t show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
28 28 { \
29 29 struct usb_device *udev; \
30 30 struct usb_host_config *actconfig; \
... ... @@ -46,7 +46,7 @@
46 46 usb_actconfig_attr (bmAttributes, 1, "%2x\n")
47 47 usb_actconfig_attr (bMaxPower, 2, "%3dmA\n")
48 48  
49   -static ssize_t show_configuration_string(struct device *dev, char *buf)
  49 +static ssize_t show_configuration_string(struct device *dev, struct device_attribute *attr, char *buf)
50 50 {
51 51 struct usb_device *udev;
52 52 struct usb_host_config *actconfig;
... ... @@ -69,7 +69,7 @@
69 69 usb_actconfig_show(bConfigurationValue, 1, "%u\n");
70 70  
71 71 static ssize_t
72   -set_bConfigurationValue (struct device *dev, const char *buf, size_t count)
  72 +set_bConfigurationValue (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
73 73 {
74 74 struct usb_device *udev = udev = to_usb_device (dev);
75 75 int config, value;
... ... @@ -87,7 +87,7 @@
87 87  
88 88 /* String fields */
89 89 #define usb_string_attr(name) \
90   -static ssize_t show_##name(struct device *dev, char *buf) \
  90 +static ssize_t show_##name(struct device *dev, struct device_attribute *attr, char *buf) \
91 91 { \
92 92 struct usb_device *udev; \
93 93 int len; \
... ... @@ -107,7 +107,7 @@
107 107 usb_string_attr(serial);
108 108  
109 109 static ssize_t
110   -show_speed (struct device *dev, char *buf)
  110 +show_speed (struct device *dev, struct device_attribute *attr, char *buf)
111 111 {
112 112 struct usb_device *udev;
113 113 char *speed;
... ... @@ -133,7 +133,7 @@
133 133 static DEVICE_ATTR(speed, S_IRUGO, show_speed, NULL);
134 134  
135 135 static ssize_t
136   -show_devnum (struct device *dev, char *buf)
  136 +show_devnum (struct device *dev, struct device_attribute *attr, char *buf)
137 137 {
138 138 struct usb_device *udev;
139 139  
... ... @@ -143,7 +143,7 @@
143 143 static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL);
144 144  
145 145 static ssize_t
146   -show_version (struct device *dev, char *buf)
  146 +show_version (struct device *dev, struct device_attribute *attr, char *buf)
147 147 {
148 148 struct usb_device *udev;
149 149 u16 bcdUSB;
... ... @@ -155,7 +155,7 @@
155 155 static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
156 156  
157 157 static ssize_t
158   -show_maxchild (struct device *dev, char *buf)
  158 +show_maxchild (struct device *dev, struct device_attribute *attr, char *buf)
159 159 {
160 160 struct usb_device *udev;
161 161  
... ... @@ -167,7 +167,7 @@
167 167 /* Descriptor fields */
168 168 #define usb_descriptor_attr_le16(field, format_string) \
169 169 static ssize_t \
170   -show_##field (struct device *dev, char *buf) \
  170 +show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
171 171 { \
172 172 struct usb_device *udev; \
173 173 \
... ... @@ -183,7 +183,7 @@
183 183  
184 184 #define usb_descriptor_attr(field, format_string) \
185 185 static ssize_t \
186   -show_##field (struct device *dev, char *buf) \
  186 +show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
187 187 { \
188 188 struct usb_device *udev; \
189 189 \
... ... @@ -254,7 +254,7 @@
254 254 /* Interface fields */
255 255 #define usb_intf_attr(field, format_string) \
256 256 static ssize_t \
257   -show_##field (struct device *dev, char *buf) \
  257 +show_##field (struct device *dev, struct device_attribute *attr, char *buf) \
258 258 { \
259 259 struct usb_interface *intf = to_usb_interface (dev); \
260 260 \
... ... @@ -269,7 +269,7 @@
269 269 usb_intf_attr (bInterfaceSubClass, "%02x\n")
270 270 usb_intf_attr (bInterfaceProtocol, "%02x\n")
271 271  
272   -static ssize_t show_interface_string(struct device *dev, char *buf)
  272 +static ssize_t show_interface_string(struct device *dev, struct device_attribute *attr, char *buf)
273 273 {
274 274 struct usb_interface *intf;
275 275 struct usb_device *udev;
drivers/usb/gadget/dummy_hcd.c
Diff comments   View file @ 10523b3
... ... @@ -633,7 +633,7 @@
633 633  
634 634 /* "function" sysfs attribute */
635 635 static ssize_t
636   -show_function (struct device *dev, char *buf)
  636 +show_function (struct device *dev, struct device_attribute *attr, char *buf)
637 637 {
638 638 struct dummy *dum = gadget_dev_to_dummy (dev);
639 639  
... ... @@ -1600,7 +1600,7 @@
1600 1600 }
1601 1601  
1602 1602 static ssize_t
1603   -show_urbs (struct device *dev, char *buf)
  1603 +show_urbs (struct device *dev, struct device_attribute *attr, char *buf)
1604 1604 {
1605 1605 struct usb_hcd *hcd = dev_get_drvdata (dev);
1606 1606 struct dummy *dum = hcd_to_dummy (hcd);
drivers/usb/gadget/file_storage.c
Diff comments   View file @ 10523b3
... ... @@ -3554,14 +3554,14 @@
3554 3554 }
3555 3555  
3556 3556  
3557   -static ssize_t show_ro(struct device *dev, char *buf)
  3557 +static ssize_t show_ro(struct device *dev, struct device_attribute *attr, char *buf)
3558 3558 {
3559 3559 struct lun *curlun = dev_to_lun(dev);
3560 3560  
3561 3561 return sprintf(buf, "%d\n", curlun->ro);
3562 3562 }
3563 3563  
3564   -static ssize_t show_file(struct device *dev, char *buf)
  3564 +static ssize_t show_file(struct device *dev, struct device_attribute *attr, char *buf)
3565 3565 {
3566 3566 struct lun *curlun = dev_to_lun(dev);
3567 3567 struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
... ... @@ -3589,7 +3589,7 @@
3589 3589 }
3590 3590  
3591 3591  
3592   -static ssize_t store_ro(struct device *dev, const char *buf, size_t count)
  3592 +static ssize_t store_ro(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
3593 3593 {
3594 3594 ssize_t rc = count;
3595 3595 struct lun *curlun = dev_to_lun(dev);
... ... @@ -3613,7 +3613,7 @@
3613 3613 return rc;
3614 3614 }
3615 3615  
3616   -static ssize_t store_file(struct device *dev, const char *buf, size_t count)
  3616 +static ssize_t store_file(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
3617 3617 {
3618 3618 struct lun *curlun = dev_to_lun(dev);
3619 3619 struct fsg_dev *fsg = (struct fsg_dev *) dev_get_drvdata(dev);
drivers/usb/gadget/net2280.c
Diff comments   View file @ 10523b3
... ... @@ -1469,7 +1469,7 @@
1469 1469  
1470 1470 /* "function" sysfs attribute */
1471 1471 static ssize_t
1472   -show_function (struct device *_dev, char *buf)
  1472 +show_function (struct device *_dev, struct device_attribute *attr, char *buf)
1473 1473 {
1474 1474 struct net2280 *dev = dev_get_drvdata (_dev);
1475 1475  
... ... @@ -1482,7 +1482,7 @@
1482 1482 static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
1483 1483  
1484 1484 static ssize_t
1485   -show_registers (struct device *_dev, char *buf)
  1485 +show_registers (struct device *_dev, struct device_attribute *attr, char *buf)
1486 1486 {
1487 1487 struct net2280 *dev;
1488 1488 char *next;
... ... @@ -1637,7 +1637,7 @@
1637 1637 static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
1638 1638  
1639 1639 static ssize_t
1640   -show_queues (struct device *_dev, char *buf)
  1640 +show_queues (struct device *_dev, struct device_attribute *attr, char *buf)
1641 1641 {
1642 1642 struct net2280 *dev;
1643 1643 char *next;
drivers/usb/gadget/pxa2xx_udc.c
Diff comments   View file @ 10523b3
... ... @@ -1429,7 +1429,7 @@
1429 1429  
1430 1430 /* "function" sysfs attribute */
1431 1431 static ssize_t
1432   -show_function (struct device *_dev, char *buf)
  1432 +show_function (struct device *_dev, struct device_attribute *attr, char *buf)
1433 1433 {
1434 1434 struct pxa2xx_udc *dev = dev_get_drvdata (_dev);
1435 1435