diff options
Diffstat (limited to 'drivers/s390/block')
-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) static struct dasd_ccw_req * dasd_eckd_build_format(struct dasd_device *base, struct format_data_t *fdata, - int enable_PAV) + int enable_pav) { struct dasd_eckd_private *base_priv; struct dasd_eckd_private *start_priv; @@ -2080,7 +2080,7 @@ dasd_eckd_build_format(struct dasd_device *base, int nr_tracks; int use_prefix; - if (enable_PAV) + if (enable_pav) startdev = dasd_alias_get_start_dev(base); if (!startdev) @@ -2324,7 +2324,7 @@ dasd_eckd_build_format(struct dasd_device *base, static int dasd_eckd_format_device(struct dasd_device *base, struct format_data_t *fdata, - int enable_PAV) + int enable_pav) { struct dasd_ccw_req *cqr, *n; struct dasd_block *block; @@ -2370,7 +2370,7 @@ dasd_eckd_format_device(struct dasd_device *base, old_stop = fdata->stop_unit; while (fdata->start_unit <= 1) { fdata->stop_unit = fdata->start_unit; - cqr = dasd_eckd_build_format(base, fdata, enable_PAV); + cqr = dasd_eckd_build_format(base, fdata, enable_pav); list_add(&cqr->blocklist, &format_queue); fdata->stop_unit = old_stop; @@ -2388,7 +2388,7 @@ retry: if (step > format_step) fdata->stop_unit = fdata->start_unit + format_step - 1; - cqr = dasd_eckd_build_format(base, fdata, enable_PAV); + cqr = dasd_eckd_build_format(base, fdata, enable_pav); if (IS_ERR(cqr)) { if (PTR_ERR(cqr) == -ENOMEM) { /* 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 { int (*term_IO) (struct dasd_ccw_req *); void (*handle_terminated_request) (struct dasd_ccw_req *); int (*format_device) (struct dasd_device *, - struct format_data_t *, int enable_PAV); + struct format_data_t *, int enable_pav); int (*free_cp) (struct dasd_ccw_req *, struct request *); /* 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 dasd_format(struct dasd_block *block, struct format_data_t *fdata) { struct dasd_device *base; - int enable_PAV = 1; + int enable_pav = 1; int rc, retries; int start, stop; @@ -238,12 +238,12 @@ dasd_format(struct dasd_block *block, struct format_data_t *fdata) start = fdata->start_unit; stop = fdata->stop_unit; do { - rc = base->discipline->format_device(base, fdata, enable_PAV); + rc = base->discipline->format_device(base, fdata, enable_pav); if (rc) { if (rc == -EAGAIN) { retries--; /* disable PAV in case of errors */ - enable_PAV = 0; + enable_pav = 0; fdata->start_unit = start; fdata->stop_unit = stop; } else |