Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sven Schnelle and committed by
Alexander Gordeev
a70f7276 e2d2a296

+30 -36
+30 -36
arch/s390/kernel/ipl.c
··· 232 232 _ipl_blk.ssid, _ipl_blk.devno); \ 233 233 IPL_ATTR_CCW_STORE_FN(_prefix, _name, _ipl_blk); \ 234 234 static struct kobj_attribute sys_##_prefix##_##_name##_attr = \ 235 - __ATTR(_name, (S_IRUGO | S_IWUSR), \ 235 + __ATTR(_name, 0644, \ 236 236 sys_##_prefix##_##_name##_show, \ 237 237 sys_##_prefix##_##_name##_store) \ 238 238 239 239 #define DEFINE_IPL_ATTR_RO(_prefix, _name, _format, _value) \ 240 240 IPL_ATTR_SHOW_FN(_prefix, _name, _format, _value) \ 241 241 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) 243 243 244 244 #define DEFINE_IPL_ATTR_RW(_prefix, _name, _fmt_out, _fmt_in, _value) \ 245 245 IPL_ATTR_SHOW_FN(_prefix, _name, _fmt_out, (unsigned long long) _value) \ ··· 254 254 return len; \ 255 255 } \ 256 256 static struct kobj_attribute sys_##_prefix##_##_name##_attr = \ 257 - __ATTR(_name,(S_IRUGO | S_IWUSR), \ 257 + __ATTR(_name, 0644, \ 258 258 sys_##_prefix##_##_name##_show, \ 259 259 sys_##_prefix##_##_name##_store) 260 260 ··· 269 269 return len; \ 270 270 } \ 271 271 static struct kobj_attribute sys_##_prefix##_##_name##_attr = \ 272 - __ATTR(_name,(S_IRUGO | S_IWUSR), \ 272 + __ATTR(_name, 0644, \ 273 273 sys_##_prefix##_##_name##_show, \ 274 274 sys_##_prefix##_##_name##_store) 275 275 ··· 344 344 } 345 345 346 346 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); 348 348 349 349 static ssize_t sys_ipl_device_show(struct kobject *kobj, 350 350 struct kobj_attribute *attr, char *page) ··· 369 369 } 370 370 371 371 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); 373 373 374 374 static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj, 375 375 struct bin_attribute *attr, char *buf, ··· 379 379 ipl_block.hdr.len); 380 380 } 381 381 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, 383 383 PAGE_SIZE); 384 384 385 385 static ssize_t ipl_scp_data_read(struct file *filp, struct kobject *kobj, ··· 413 413 } 414 414 415 415 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); 417 417 418 418 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); 420 420 421 421 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); 423 423 424 424 static struct bin_attribute *ipl_fcp_bin_attrs[] = { 425 425 &ipl_parameter_attr, ··· 530 530 531 531 IPL_ATTR_BR_CHR_SHOW_FN(ipl, ipl_block.eckd); 532 532 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); 536 534 537 535 IPL_ATTR_BR_CHR_SHOW_FN(reipl, reipl_block_eckd->eckd); 538 536 IPL_ATTR_BR_CHR_STORE_FN(reipl, reipl_block_eckd->eckd); 539 537 540 538 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); 544 540 545 541 static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj, 546 542 struct kobj_attribute *attr, char *page) ··· 779 783 } 780 784 781 785 static struct kobj_attribute sys_reipl_nss_vmparm_attr = 782 - __ATTR(parm, S_IRUGO | S_IWUSR, reipl_nss_vmparm_show, 783 - reipl_nss_vmparm_store); 786 + __ATTR(parm, 0644, reipl_nss_vmparm_show, 787 + reipl_nss_vmparm_store); 784 788 static struct kobj_attribute sys_reipl_ccw_vmparm_attr = 785 - __ATTR(parm, S_IRUGO | S_IWUSR, reipl_ccw_vmparm_show, 786 - reipl_ccw_vmparm_store); 789 + __ATTR(parm, 0644, reipl_ccw_vmparm_show, 790 + reipl_ccw_vmparm_store); 787 791 788 792 /* FCP reipl device attributes */ 789 793 ··· 823 827 return count; 824 828 } 825 829 static struct bin_attribute sys_reipl_fcp_scp_data_attr = 826 - __BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_fcp_scpdata_read, 830 + __BIN_ATTR(scp_data, 0644, reipl_fcp_scpdata_read, 827 831 reipl_fcp_scpdata_write, DIAG308_SCPDATA_SIZE); 828 832 829 833 static struct bin_attribute *reipl_fcp_bin_attrs[] = { ··· 903 907 } 904 908 905 909 static struct kobj_attribute sys_reipl_fcp_loadparm_attr = 906 - __ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_fcp_loadparm_show, 907 - reipl_fcp_loadparm_store); 910 + __ATTR(loadparm, 0644, reipl_fcp_loadparm_show, 911 + reipl_fcp_loadparm_store); 908 912 909 913 static ssize_t reipl_fcp_clear_show(struct kobject *kobj, 910 914 struct kobj_attribute *attr, char *page) ··· 977 981 } 978 982 979 983 static struct bin_attribute sys_reipl_nvme_scp_data_attr = 980 - __BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_nvme_scpdata_read, 984 + __BIN_ATTR(scp_data, 0644, reipl_nvme_scpdata_read, 981 985 reipl_nvme_scpdata_write, DIAG308_SCPDATA_SIZE); 982 986 983 987 static struct bin_attribute *reipl_nvme_bin_attrs[] = { ··· 1009 1013 } 1010 1014 1011 1015 static struct kobj_attribute sys_reipl_nvme_loadparm_attr = 1012 - __ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_nvme_loadparm_show, 1013 - reipl_nvme_loadparm_store); 1016 + __ATTR(loadparm, 0644, reipl_nvme_loadparm_show, 1017 + reipl_nvme_loadparm_store); 1014 1018 1015 1019 static struct attribute *reipl_nvme_attrs[] = { 1016 1020 &sys_reipl_nvme_fid_attr.attr, ··· 1076 1080 } 1077 1081 1078 1082 static struct kobj_attribute sys_reipl_ccw_loadparm_attr = 1079 - __ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_ccw_loadparm_show, 1080 - reipl_ccw_loadparm_store); 1083 + __ATTR(loadparm, 0644, reipl_ccw_loadparm_show, 1084 + reipl_ccw_loadparm_store); 1081 1085 1082 1086 static ssize_t reipl_ccw_clear_show(struct kobject *kobj, 1083 1087 struct kobj_attribute *attr, char *page) ··· 1160 1164 } 1161 1165 1162 1166 static struct bin_attribute sys_reipl_eckd_scp_data_attr = 1163 - __BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_eckd_scpdata_read, 1167 + __BIN_ATTR(scp_data, 0644, reipl_eckd_scpdata_read, 1164 1168 reipl_eckd_scpdata_write, DIAG308_SCPDATA_SIZE); 1165 1169 1166 1170 static struct bin_attribute *reipl_eckd_bin_attrs[] = { ··· 1248 1252 } 1249 1253 1250 1254 static struct kobj_attribute sys_reipl_nss_name_attr = 1251 - __ATTR(name, S_IRUGO | S_IWUSR, reipl_nss_name_show, 1252 - reipl_nss_name_store); 1255 + __ATTR(name, 0644, reipl_nss_name_show, 1256 + reipl_nss_name_store); 1253 1257 1254 1258 static struct kobj_attribute sys_reipl_nss_loadparm_attr = 1255 - __ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_nss_loadparm_show, 1256 - reipl_nss_loadparm_store); 1259 + __ATTR(loadparm, 0644, reipl_nss_loadparm_show, 1260 + reipl_nss_loadparm_store); 1257 1261 1258 1262 static struct attribute *reipl_nss_attrs[] = { 1259 1263 &sys_reipl_nss_name_attr.attr, ··· 1754 1758 IPL_ATTR_BR_CHR_STORE_FN(dump, dump_block_eckd->eckd); 1755 1759 1756 1760 static struct kobj_attribute sys_dump_eckd_br_chr_attr = 1757 - __ATTR(br_chr, (S_IRUGO | S_IWUSR), 1758 - eckd_dump_br_chr_show, 1759 - eckd_dump_br_chr_store); 1761 + __ATTR(br_chr, 0644, eckd_dump_br_chr_show, eckd_dump_br_chr_store); 1760 1762 1761 1763 static struct attribute *dump_eckd_attrs[] = { 1762 1764 &sys_dump_eckd_device_attr.attr,