Skip to content

Commit a70f727

Browse files
svens-s390Alexander Gordeev
svens-s390
authored and
Alexander Gordeev
committed
s390/ipl: use octal values instead of S_* macros
octal values are easier to read and checkpatch also recommends to use them, so replace all the S_* macros with their counterparts. Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent e2d2a29 commit a70f727

File tree

1 file changed

+30
-36
lines changed

1 file changed

+30
-36
lines changed

‎arch/s390/kernel/ipl.c‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,14 @@ IPL_ATTR_SHOW_FN(_prefix, _name, "0.%x.%04x\n", \
232232
_ipl_blk.ssid, _ipl_blk.devno); \
233233
IPL_ATTR_CCW_STORE_FN(_prefix, _name, _ipl_blk); \
234234
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
235-
__ATTR(_name, (S_IRUGO | S_IWUSR), \
235+
__ATTR(_name, 0644, \
236236
sys_##_prefix##_##_name##_show, \
237237
sys_##_prefix##_##_name##_store) \
238238

239239
#define DEFINE_IPL_ATTR_RO(_prefix, _name, _format, _value) \
240240
IPL_ATTR_SHOW_FN(_prefix, _name, _format, _value) \
241241
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
242-
__ATTR(_name, S_IRUGO, sys_##_prefix##_##_name##_show, NULL)
242+
__ATTR(_name, 0444, sys_##_prefix##_##_name##_show, NULL)
243243

244244
#define DEFINE_IPL_ATTR_RW(_prefix, _name, _fmt_out, _fmt_in, _value) \
245245
IPL_ATTR_SHOW_FN(_prefix, _name, _fmt_out, (unsigned long long) _value) \
@@ -254,7 +254,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \
254254
return len; \
255255
} \
256256
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
257-
__ATTR(_name,(S_IRUGO | S_IWUSR), \
257+
__ATTR(_name, 0644, \
258258
sys_##_prefix##_##_name##_show, \
259259
sys_##_prefix##_##_name##_store)
260260

@@ -269,7 +269,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \
269269
return len; \
270270
} \
271271
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
272-
__ATTR(_name,(S_IRUGO | S_IWUSR), \
272+
__ATTR(_name, 0644, \
273273
sys_##_prefix##_##_name##_show, \
274274
sys_##_prefix##_##_name##_store)
275275

@@ -344,7 +344,7 @@ static ssize_t ipl_vm_parm_show(struct kobject *kobj,
344344
}
345345

346346
static struct kobj_attribute sys_ipl_vm_parm_attr =
347-
__ATTR(parm, S_IRUGO, ipl_vm_parm_show, NULL);
347+
__ATTR(parm, 0444, ipl_vm_parm_show, NULL);
348348

349349
static ssize_t sys_ipl_device_show(struct kobject *kobj,
350350
struct kobj_attribute *attr, char *page)
@@ -369,7 +369,7 @@ static ssize_t sys_ipl_device_show(struct kobject *kobj,
369369
}
370370

371371
static struct kobj_attribute sys_ipl_device_attr =
372-
__ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
372+
__ATTR(device, 0444, sys_ipl_device_show, NULL);
373373

374374
static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj,
375375
struct bin_attribute *attr, char *buf,
@@ -379,7 +379,7 @@ static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj,
379379
ipl_block.hdr.len);
380380
}
381381
static struct bin_attribute ipl_parameter_attr =
382-
__BIN_ATTR(binary_parameter, S_IRUGO, ipl_parameter_read, NULL,
382+
__BIN_ATTR(binary_parameter, 0444, ipl_parameter_read, NULL,
383383
PAGE_SIZE);
384384

385385
static ssize_t ipl_scp_data_read(struct file *filp, struct kobject *kobj,
@@ -413,13 +413,13 @@ static ssize_t ipl_eckd_scp_data_read(struct file *filp, struct kobject *kobj,
413413
}
414414

415415
static struct bin_attribute ipl_scp_data_attr =
416-
__BIN_ATTR(scp_data, S_IRUGO, ipl_scp_data_read, NULL, PAGE_SIZE);
416+
__BIN_ATTR(scp_data, 0444, ipl_scp_data_read, NULL, PAGE_SIZE);
417417

418418
static struct bin_attribute ipl_nvme_scp_data_attr =
419-
__BIN_ATTR(scp_data, S_IRUGO, ipl_nvme_scp_data_read, NULL, PAGE_SIZE);
419+
__BIN_ATTR(scp_data, 0444, ipl_nvme_scp_data_read, NULL, PAGE_SIZE);
420420

421421
static struct bin_attribute ipl_eckd_scp_data_attr =
422-
__BIN_ATTR(scp_data, S_IRUGO, ipl_eckd_scp_data_read, NULL, PAGE_SIZE);
422+
__BIN_ATTR(scp_data, 0444, ipl_eckd_scp_data_read, NULL, PAGE_SIZE);
423423

424424
static struct bin_attribute *ipl_fcp_bin_attrs[] = {
425425
&ipl_parameter_attr,
@@ -530,17 +530,13 @@ err: \
530530

531531
IPL_ATTR_BR_CHR_SHOW_FN(ipl, ipl_block.eckd);
532532
static struct kobj_attribute sys_ipl_eckd_br_chr_attr =
533-
__ATTR(br_chr, (S_IRUGO | S_IWUSR),
534-
eckd_ipl_br_chr_show,
535-
NULL);
533+
__ATTR(br_chr, 0644, eckd_ipl_br_chr_show, NULL);
536534

537535
IPL_ATTR_BR_CHR_SHOW_FN(reipl, reipl_block_eckd->eckd);
538536
IPL_ATTR_BR_CHR_STORE_FN(reipl, reipl_block_eckd->eckd);
539537

540538
static struct kobj_attribute sys_reipl_eckd_br_chr_attr =
541-
__ATTR(br_chr, (S_IRUGO | S_IWUSR),
542-
eckd_reipl_br_chr_show,
543-
eckd_reipl_br_chr_store);
539+
__ATTR(br_chr, 0644, eckd_reipl_br_chr_show, eckd_reipl_br_chr_store);
544540

545541
static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,
546542
struct kobj_attribute *attr, char *page)
@@ -783,11 +779,11 @@ static ssize_t reipl_ccw_vmparm_store(struct kobject *kobj,
783779
}
784780

785781
static struct kobj_attribute sys_reipl_nss_vmparm_attr =
786-
__ATTR(parm, S_IRUGO | S_IWUSR, reipl_nss_vmparm_show,
787-
reipl_nss_vmparm_store);
782+
__ATTR(parm, 0644, reipl_nss_vmparm_show,
783+
reipl_nss_vmparm_store);
788784
static struct kobj_attribute sys_reipl_ccw_vmparm_attr =
789-
__ATTR(parm, S_IRUGO | S_IWUSR, reipl_ccw_vmparm_show,
790-
reipl_ccw_vmparm_store);
785+
__ATTR(parm, 0644, reipl_ccw_vmparm_show,
786+
reipl_ccw_vmparm_store);
791787

792788
/* FCP reipl device attributes */
793789

@@ -827,7 +823,7 @@ static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,
827823
return count;
828824
}
829825
static struct bin_attribute sys_reipl_fcp_scp_data_attr =
830-
__BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_fcp_scpdata_read,
826+
__BIN_ATTR(scp_data, 0644, reipl_fcp_scpdata_read,
831827
reipl_fcp_scpdata_write, DIAG308_SCPDATA_SIZE);
832828

833829
static struct bin_attribute *reipl_fcp_bin_attrs[] = {
@@ -907,8 +903,8 @@ static ssize_t reipl_fcp_loadparm_store(struct kobject *kobj,
907903
}
908904

909905
static struct kobj_attribute sys_reipl_fcp_loadparm_attr =
910-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_fcp_loadparm_show,
911-
reipl_fcp_loadparm_store);
906+
__ATTR(loadparm, 0644, reipl_fcp_loadparm_show,
907+
reipl_fcp_loadparm_store);
912908

913909
static ssize_t reipl_fcp_clear_show(struct kobject *kobj,
914910
struct kobj_attribute *attr, char *page)
@@ -981,7 +977,7 @@ static ssize_t reipl_nvme_scpdata_write(struct file *filp, struct kobject *kobj,
981977
}
982978

983979
static struct bin_attribute sys_reipl_nvme_scp_data_attr =
984-
__BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_nvme_scpdata_read,
980+
__BIN_ATTR(scp_data, 0644, reipl_nvme_scpdata_read,
985981
reipl_nvme_scpdata_write, DIAG308_SCPDATA_SIZE);
986982

987983
static struct bin_attribute *reipl_nvme_bin_attrs[] = {
@@ -1013,8 +1009,8 @@ static ssize_t reipl_nvme_loadparm_store(struct kobject *kobj,
10131009
}
10141010

10151011
static struct kobj_attribute sys_reipl_nvme_loadparm_attr =
1016-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_nvme_loadparm_show,
1017-
reipl_nvme_loadparm_store);
1012+
__ATTR(loadparm, 0644, reipl_nvme_loadparm_show,
1013+
reipl_nvme_loadparm_store);
10181014

10191015
static struct attribute *reipl_nvme_attrs[] = {
10201016
&sys_reipl_nvme_fid_attr.attr,
@@ -1080,8 +1076,8 @@ static ssize_t reipl_ccw_loadparm_store(struct kobject *kobj,
10801076
}
10811077

10821078
static struct kobj_attribute sys_reipl_ccw_loadparm_attr =
1083-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_ccw_loadparm_show,
1084-
reipl_ccw_loadparm_store);
1079+
__ATTR(loadparm, 0644, reipl_ccw_loadparm_show,
1080+
reipl_ccw_loadparm_store);
10851081

10861082
static ssize_t reipl_ccw_clear_show(struct kobject *kobj,
10871083
struct kobj_attribute *attr, char *page)
@@ -1164,7 +1160,7 @@ static ssize_t reipl_eckd_scpdata_write(struct file *filp, struct kobject *kobj,
11641160
}
11651161

11661162
static struct bin_attribute sys_reipl_eckd_scp_data_attr =
1167-
__BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_eckd_scpdata_read,
1163+
__BIN_ATTR(scp_data, 0644, reipl_eckd_scpdata_read,
11681164
reipl_eckd_scpdata_write, DIAG308_SCPDATA_SIZE);
11691165

11701166
static struct bin_attribute *reipl_eckd_bin_attrs[] = {
@@ -1252,12 +1248,12 @@ static ssize_t reipl_nss_name_store(struct kobject *kobj,
12521248
}
12531249

12541250
static struct kobj_attribute sys_reipl_nss_name_attr =
1255-
__ATTR(name, S_IRUGO | S_IWUSR, reipl_nss_name_show,
1256-
reipl_nss_name_store);
1251+
__ATTR(name, 0644, reipl_nss_name_show,
1252+
reipl_nss_name_store);
12571253

12581254
static struct kobj_attribute sys_reipl_nss_loadparm_attr =
1259-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_nss_loadparm_show,
1260-
reipl_nss_loadparm_store);
1255+
__ATTR(loadparm, 0644, reipl_nss_loadparm_show,
1256+
reipl_nss_loadparm_store);
12611257

12621258
static struct attribute *reipl_nss_attrs[] = {
12631259
&sys_reipl_nss_name_attr.attr,
@@ -1758,9 +1754,7 @@ IPL_ATTR_BR_CHR_SHOW_FN(dump, dump_block_eckd->eckd);
17581754
IPL_ATTR_BR_CHR_STORE_FN(dump, dump_block_eckd->eckd);
17591755

17601756
static struct kobj_attribute sys_dump_eckd_br_chr_attr =
1761-
__ATTR(br_chr, (S_IRUGO | S_IWUSR),
1762-
eckd_dump_br_chr_show,
1763-
eckd_dump_br_chr_store);
1757+
__ATTR(br_chr, 0644, eckd_dump_br_chr_show, eckd_dump_br_chr_store);
17641758

17651759
static struct attribute *dump_eckd_attrs[] = {
17661760
&sys_dump_eckd_device_attr.attr,

0 commit comments

Comments
 (0)