diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/block/dasd_eckd.c | 10 | ||||
-rw-r--r-- | drivers/s390/block/dasd_int.h | 2 | ||||
-rw-r--r-- | drivers/s390/block/dasd_ioctl.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index e74e5f7b431d..51dea7baf02c 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
@@ -2062,7 +2062,7 @@ dasd_eckd_fill_geometry(struct dasd_block *block, struct hd_geometry *geo) | |||
2062 | static struct dasd_ccw_req * | 2062 | static struct dasd_ccw_req * |
2063 | dasd_eckd_build_format(struct dasd_device *base, | 2063 | dasd_eckd_build_format(struct dasd_device *base, |
2064 | struct format_data_t *fdata, | 2064 | struct format_data_t *fdata, |
2065 | int enable_PAV) | 2065 | int enable_pav) |
2066 | { | 2066 | { |
2067 | struct dasd_eckd_private *base_priv; | 2067 | struct dasd_eckd_private *base_priv; |
2068 | struct dasd_eckd_private *start_priv; | 2068 | struct dasd_eckd_private *start_priv; |
@@ -2080,7 +2080,7 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
2080 | int nr_tracks; | 2080 | int nr_tracks; |
2081 | int use_prefix; | 2081 | int use_prefix; |
2082 | 2082 | ||
2083 | if (enable_PAV) | 2083 | if (enable_pav) |
2084 | startdev = dasd_alias_get_start_dev(base); | 2084 | startdev = dasd_alias_get_start_dev(base); |
2085 | 2085 | ||
2086 | if (!startdev) | 2086 | if (!startdev) |
@@ -2324,7 +2324,7 @@ dasd_eckd_build_format(struct dasd_device *base, | |||
2324 | static int | 2324 | static int |
2325 | dasd_eckd_format_device(struct dasd_device *base, | 2325 | dasd_eckd_format_device(struct dasd_device *base, |
2326 | struct format_data_t *fdata, | 2326 | struct format_data_t *fdata, |
2327 | int enable_PAV) | 2327 | int enable_pav) |
2328 | { | 2328 | { |
2329 | struct dasd_ccw_req *cqr, *n; | 2329 | struct dasd_ccw_req *cqr, *n; |
2330 | struct dasd_block *block; | 2330 | struct dasd_block *block; |
@@ -2370,7 +2370,7 @@ dasd_eckd_format_device(struct dasd_device *base, | |||
2370 | old_stop = fdata->stop_unit; | 2370 | old_stop = fdata->stop_unit; |
2371 | while (fdata->start_unit <= 1) { | 2371 | while (fdata->start_unit <= 1) { |
2372 | fdata->stop_unit = fdata->start_unit; | 2372 | fdata->stop_unit = fdata->start_unit; |
2373 | cqr = dasd_eckd_build_format(base, fdata, enable_PAV); | 2373 | cqr = dasd_eckd_build_format(base, fdata, enable_pav); |
2374 | list_add(&cqr->blocklist, &format_queue); | 2374 | list_add(&cqr->blocklist, &format_queue); |
2375 | 2375 | ||
2376 | fdata->stop_unit = old_stop; | 2376 | fdata->stop_unit = old_stop; |
@@ -2388,7 +2388,7 @@ retry: | |||
2388 | if (step > format_step) | 2388 | if (step > format_step) |
2389 | fdata->stop_unit = fdata->start_unit + format_step - 1; | 2389 | fdata->stop_unit = fdata->start_unit + format_step - 1; |
2390 | 2390 | ||
2391 | cqr = dasd_eckd_build_format(base, fdata, enable_PAV); | 2391 | cqr = dasd_eckd_build_format(base, fdata, enable_pav); |
2392 | if (IS_ERR(cqr)) { | 2392 | if (IS_ERR(cqr)) { |
2393 | if (PTR_ERR(cqr) == -ENOMEM) { | 2393 | if (PTR_ERR(cqr) == -ENOMEM) { |
2394 | /* | 2394 | /* |
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index 2cc188c8203f..c20170166909 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h | |||
@@ -322,7 +322,7 @@ struct dasd_discipline { | |||
322 | int (*term_IO) (struct dasd_ccw_req *); | 322 | int (*term_IO) (struct dasd_ccw_req *); |
323 | void (*handle_terminated_request) (struct dasd_ccw_req *); | 323 | void (*handle_terminated_request) (struct dasd_ccw_req *); |
324 | int (*format_device) (struct dasd_device *, | 324 | int (*format_device) (struct dasd_device *, |
325 | struct format_data_t *, int enable_PAV); | 325 | struct format_data_t *, int enable_pav); |
326 | int (*free_cp) (struct dasd_ccw_req *, struct request *); | 326 | int (*free_cp) (struct dasd_ccw_req *, struct request *); |
327 | 327 | ||
328 | /* | 328 | /* |
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index ad62608e4175..02837d0ad942 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
@@ -203,7 +203,7 @@ static int | |||
203 | dasd_format(struct dasd_block *block, struct format_data_t *fdata) | 203 | dasd_format(struct dasd_block *block, struct format_data_t *fdata) |
204 | { | 204 | { |
205 | struct dasd_device *base; | 205 | struct dasd_device *base; |
206 | int enable_PAV = 1; | 206 | int enable_pav = 1; |
207 | int rc, retries; | 207 | int rc, retries; |
208 | int start, stop; | 208 | int start, stop; |
209 | 209 | ||
@@ -238,12 +238,12 @@ dasd_format(struct dasd_block *block, struct format_data_t *fdata) | |||
238 | start = fdata->start_unit; | 238 | start = fdata->start_unit; |
239 | stop = fdata->stop_unit; | 239 | stop = fdata->stop_unit; |
240 | do { | 240 | do { |
241 | rc = base->discipline->format_device(base, fdata, enable_PAV); | 241 | rc = base->discipline->format_device(base, fdata, enable_pav); |
242 | if (rc) { | 242 | if (rc) { |
243 | if (rc == -EAGAIN) { | 243 | if (rc == -EAGAIN) { |
244 | retries--; | 244 | retries--; |
245 | /* disable PAV in case of errors */ | 245 | /* disable PAV in case of errors */ |
246 | enable_PAV = 0; | 246 | enable_pav = 0; |
247 | fdata->start_unit = start; | 247 | fdata->start_unit = start; |
248 | fdata->stop_unit = stop; | 248 | fdata->stop_unit = stop; |
249 | } else | 249 | } else |