diff options
author | Yani Ioannou <yani.ioannou@gmail.com> | 2005-05-17 06:43:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 18:15:35 -0400 |
commit | 10523b3b82456e416cbaffcc24ea2246980aa746 (patch) | |
tree | fab3ac16bffb04cc25683e83a583b1cae3f0d450 /drivers/s390/scsi | |
parent | 3fd3c0a5f53a0f9d8987b90acbd84f7dd8ef606e (diff) |
[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>
Diffstat (limited to 'drivers/s390/scsi')
-rw-r--r-- | drivers/s390/scsi/zfcp_scsi.c | 2 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_sysfs_adapter.c | 10 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_sysfs_port.c | 10 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_sysfs_unit.c | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index 6965992ddbbf..b61d309352c3 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
@@ -924,7 +924,7 @@ struct fc_function_template zfcp_transport_functions = { | |||
924 | * Generates attribute for a unit. | 924 | * Generates attribute for a unit. |
925 | */ | 925 | */ |
926 | #define ZFCP_DEFINE_SCSI_ATTR(_name, _format, _value) \ | 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 | char *buf) \ | 928 | char *buf) \ |
929 | { \ | 929 | { \ |
930 | struct scsi_device *sdev; \ | 930 | struct scsi_device *sdev; \ |
diff --git a/drivers/s390/scsi/zfcp_sysfs_adapter.c b/drivers/s390/scsi/zfcp_sysfs_adapter.c index 23e2dca55bb8..e7345a74800a 100644 --- a/drivers/s390/scsi/zfcp_sysfs_adapter.c +++ b/drivers/s390/scsi/zfcp_sysfs_adapter.c | |||
@@ -50,7 +50,7 @@ static const char fc_topologies[5][25] = { | |||
50 | * Generates attributes for an adapter. | 50 | * Generates attributes for an adapter. |
51 | */ | 51 | */ |
52 | #define ZFCP_DEFINE_ADAPTER_ATTR(_name, _format, _value) \ | 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 | char *buf) \ | 54 | char *buf) \ |
55 | { \ | 55 | { \ |
56 | struct zfcp_adapter *adapter; \ | 56 | struct zfcp_adapter *adapter; \ |
@@ -90,7 +90,7 @@ ZFCP_DEFINE_ADAPTER_ATTR(in_recovery, "%d\n", atomic_test_mask | |||
90 | * Store function of the "port_add" attribute of an adapter. | 90 | * Store function of the "port_add" attribute of an adapter. |
91 | */ | 91 | */ |
92 | static ssize_t | 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 | wwn_t wwpn; | 95 | wwn_t wwpn; |
96 | char *endp; | 96 | char *endp; |
@@ -135,7 +135,7 @@ static DEVICE_ATTR(port_add, S_IWUSR, NULL, zfcp_sysfs_port_add_store); | |||
135 | * Store function of the "port_remove" attribute of an adapter. | 135 | * Store function of the "port_remove" attribute of an adapter. |
136 | */ | 136 | */ |
137 | static ssize_t | 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 | struct zfcp_adapter *adapter; | 140 | struct zfcp_adapter *adapter; |
141 | struct zfcp_port *port; | 141 | struct zfcp_port *port; |
@@ -196,7 +196,7 @@ static DEVICE_ATTR(port_remove, S_IWUSR, NULL, zfcp_sysfs_port_remove_store); | |||
196 | * started for the belonging adapter. | 196 | * started for the belonging adapter. |
197 | */ | 197 | */ |
198 | static ssize_t | 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 | const char *buf, size_t count) | 200 | const char *buf, size_t count) |
201 | { | 201 | { |
202 | struct zfcp_adapter *adapter; | 202 | struct zfcp_adapter *adapter; |
@@ -236,7 +236,7 @@ zfcp_sysfs_adapter_failed_store(struct device *dev, | |||
236 | * "0" if adapter is working, otherwise "1". | 236 | * "0" if adapter is working, otherwise "1". |
237 | */ | 237 | */ |
238 | static ssize_t | 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 | struct zfcp_adapter *adapter; | 241 | struct zfcp_adapter *adapter; |
242 | 242 | ||
diff --git a/drivers/s390/scsi/zfcp_sysfs_port.c b/drivers/s390/scsi/zfcp_sysfs_port.c index 6aafb2abb4b5..7a84c7d474d9 100644 --- a/drivers/s390/scsi/zfcp_sysfs_port.c +++ b/drivers/s390/scsi/zfcp_sysfs_port.c | |||
@@ -53,7 +53,7 @@ zfcp_sysfs_port_release(struct device *dev) | |||
53 | * Generates attributes for a port. | 53 | * Generates attributes for a port. |
54 | */ | 54 | */ |
55 | #define ZFCP_DEFINE_PORT_ATTR(_name, _format, _value) \ | 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 | char *buf) \ | 57 | char *buf) \ |
58 | { \ | 58 | { \ |
59 | struct zfcp_port *port; \ | 59 | struct zfcp_port *port; \ |
@@ -82,7 +82,7 @@ ZFCP_DEFINE_PORT_ATTR(access_denied, "%d\n", atomic_test_mask | |||
82 | * Store function of the "unit_add" attribute of a port. | 82 | * Store function of the "unit_add" attribute of a port. |
83 | */ | 83 | */ |
84 | static ssize_t | 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 | fcp_lun_t fcp_lun; | 87 | fcp_lun_t fcp_lun; |
88 | char *endp; | 88 | char *endp; |
@@ -125,7 +125,7 @@ static DEVICE_ATTR(unit_add, S_IWUSR, NULL, zfcp_sysfs_unit_add_store); | |||
125 | * @count: number of bytes in buffer | 125 | * @count: number of bytes in buffer |
126 | */ | 126 | */ |
127 | static ssize_t | 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 | struct zfcp_port *port; | 130 | struct zfcp_port *port; |
131 | struct zfcp_unit *unit; | 131 | struct zfcp_unit *unit; |
@@ -186,7 +186,7 @@ static DEVICE_ATTR(unit_remove, S_IWUSR, NULL, zfcp_sysfs_unit_remove_store); | |||
186 | * started for the belonging port. | 186 | * started for the belonging port. |
187 | */ | 187 | */ |
188 | static ssize_t | 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 | struct zfcp_port *port; | 191 | struct zfcp_port *port; |
192 | unsigned int val; | 192 | unsigned int val; |
@@ -224,7 +224,7 @@ zfcp_sysfs_port_failed_store(struct device *dev, const char *buf, size_t count) | |||
224 | * "0" if port is working, otherwise "1". | 224 | * "0" if port is working, otherwise "1". |
225 | */ | 225 | */ |
226 | static ssize_t | 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 | struct zfcp_port *port; | 229 | struct zfcp_port *port; |
230 | 230 | ||
diff --git a/drivers/s390/scsi/zfcp_sysfs_unit.c b/drivers/s390/scsi/zfcp_sysfs_unit.c index 87c0b461831f..0556642c9e1d 100644 --- a/drivers/s390/scsi/zfcp_sysfs_unit.c +++ b/drivers/s390/scsi/zfcp_sysfs_unit.c | |||
@@ -53,7 +53,7 @@ zfcp_sysfs_unit_release(struct device *dev) | |||
53 | * Generates attribute for a unit. | 53 | * Generates attribute for a unit. |
54 | */ | 54 | */ |
55 | #define ZFCP_DEFINE_UNIT_ATTR(_name, _format, _value) \ | 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 | char *buf) \ | 57 | char *buf) \ |
58 | { \ | 58 | { \ |
59 | struct zfcp_unit *unit; \ | 59 | struct zfcp_unit *unit; \ |
@@ -86,7 +86,7 @@ ZFCP_DEFINE_UNIT_ATTR(access_readonly, "%d\n", atomic_test_mask | |||
86 | * started for the belonging unit. | 86 | * started for the belonging unit. |
87 | */ | 87 | */ |
88 | static ssize_t | 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 | struct zfcp_unit *unit; | 91 | struct zfcp_unit *unit; |
92 | unsigned int val; | 92 | unsigned int val; |
@@ -123,7 +123,7 @@ zfcp_sysfs_unit_failed_store(struct device *dev, const char *buf, size_t count) | |||
123 | * "0" if unit is working, otherwise "1". | 123 | * "0" if unit is working, otherwise "1". |
124 | */ | 124 | */ |
125 | static ssize_t | 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 | struct zfcp_unit *unit; | 128 | struct zfcp_unit *unit; |
129 | 129 | ||