Skip to content

Commit 5d444d8

Browse files
author
Tobias Huschle
committed
s390/ipl: use octal values instead of S_* macros
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2160041 Upstream status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Tested: by IBM Build-Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=52482443 Conflicts: None commit a70f727 Author: Sven Schnelle <svens@linux.ibm.com> Date: Thu Dec 1 16:05:43 2022 +0100 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> Signed-off-by: Tobias Huschle <thuschle@redhat.com>
1 parent b8c0189 commit 5d444d8

File tree

1 file changed

+29
-33
lines changed

1 file changed

+29
-33
lines changed

‎arch/s390/kernel/ipl.c‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,14 @@ IPL_ATTR_SHOW_FN(_prefix, _name, "0.%x.%04x\n", \
223223
_ipl_blk.ssid, _ipl_blk.devno); \
224224
IPL_ATTR_CCW_STORE_FN(_prefix, _name, _ipl_blk); \
225225
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
226-
__ATTR(_name, (S_IRUGO | S_IWUSR), \
226+
__ATTR(_name, 0644, \
227227
sys_##_prefix##_##_name##_show, \
228228
sys_##_prefix##_##_name##_store) \
229229

230230
#define DEFINE_IPL_ATTR_RO(_prefix, _name, _format, _value) \
231231
IPL_ATTR_SHOW_FN(_prefix, _name, _format, _value) \
232232
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
233-
__ATTR(_name, S_IRUGO, sys_##_prefix##_##_name##_show, NULL)
233+
__ATTR(_name, 0444, sys_##_prefix##_##_name##_show, NULL)
234234

235235
#define DEFINE_IPL_ATTR_RW(_prefix, _name, _fmt_out, _fmt_in, _value) \
236236
IPL_ATTR_SHOW_FN(_prefix, _name, _fmt_out, (unsigned long long) _value) \
@@ -245,7 +245,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \
245245
return len; \
246246
} \
247247
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
248-
__ATTR(_name,(S_IRUGO | S_IWUSR), \
248+
__ATTR(_name, 0644, \
249249
sys_##_prefix##_##_name##_show, \
250250
sys_##_prefix##_##_name##_store)
251251

@@ -260,7 +260,7 @@ static ssize_t sys_##_prefix##_##_name##_store(struct kobject *kobj, \
260260
return len; \
261261
} \
262262
static struct kobj_attribute sys_##_prefix##_##_name##_attr = \
263-
__ATTR(_name,(S_IRUGO | S_IWUSR), \
263+
__ATTR(_name, 0644, \
264264
sys_##_prefix##_##_name##_show, \
265265
sys_##_prefix##_##_name##_store)
266266

@@ -332,7 +332,7 @@ static ssize_t ipl_vm_parm_show(struct kobject *kobj,
332332
}
333333

334334
static struct kobj_attribute sys_ipl_vm_parm_attr =
335-
__ATTR(parm, S_IRUGO, ipl_vm_parm_show, NULL);
335+
__ATTR(parm, 0444, ipl_vm_parm_show, NULL);
336336

337337
static ssize_t sys_ipl_device_show(struct kobject *kobj,
338338
struct kobj_attribute *attr, char *page)
@@ -356,7 +356,7 @@ static ssize_t sys_ipl_device_show(struct kobject *kobj,
356356
}
357357

358358
static struct kobj_attribute sys_ipl_device_attr =
359-
__ATTR(device, S_IRUGO, sys_ipl_device_show, NULL);
359+
__ATTR(device, 0444, sys_ipl_device_show, NULL);
360360

361361
static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj,
362362
struct bin_attribute *attr, char *buf,
@@ -366,7 +366,7 @@ static ssize_t ipl_parameter_read(struct file *filp, struct kobject *kobj,
366366
ipl_block.hdr.len);
367367
}
368368
static struct bin_attribute ipl_parameter_attr =
369-
__BIN_ATTR(binary_parameter, S_IRUGO, ipl_parameter_read, NULL,
369+
__BIN_ATTR(binary_parameter, 0444, ipl_parameter_read, NULL,
370370
PAGE_SIZE);
371371

372372
static ssize_t ipl_scp_data_read(struct file *filp, struct kobject *kobj,
@@ -400,13 +400,13 @@ static ssize_t ipl_eckd_scp_data_read(struct file *filp, struct kobject *kobj,
400400
}
401401

402402
static struct bin_attribute ipl_scp_data_attr =
403-
__BIN_ATTR(scp_data, S_IRUGO, ipl_scp_data_read, NULL, PAGE_SIZE);
403+
__BIN_ATTR(scp_data, 0444, ipl_scp_data_read, NULL, PAGE_SIZE);
404404

405405
static struct bin_attribute ipl_nvme_scp_data_attr =
406-
__BIN_ATTR(scp_data, S_IRUGO, ipl_nvme_scp_data_read, NULL, PAGE_SIZE);
406+
__BIN_ATTR(scp_data, 0444, ipl_nvme_scp_data_read, NULL, PAGE_SIZE);
407407

408408
static struct bin_attribute ipl_eckd_scp_data_attr =
409-
__BIN_ATTR(scp_data, S_IRUGO, ipl_eckd_scp_data_read, NULL, PAGE_SIZE);
409+
__BIN_ATTR(scp_data, 0444, ipl_eckd_scp_data_read, NULL, PAGE_SIZE);
410410

411411
static struct bin_attribute *ipl_fcp_bin_attrs[] = {
412412
&ipl_parameter_attr,
@@ -517,17 +517,13 @@ err: \
517517

518518
IPL_ATTR_BR_CHR_SHOW_FN(ipl, ipl_block.eckd);
519519
static struct kobj_attribute sys_ipl_eckd_br_chr_attr =
520-
__ATTR(br_chr, (S_IRUGO | S_IWUSR),
521-
eckd_ipl_br_chr_show,
522-
NULL);
520+
__ATTR(br_chr, 0644, eckd_ipl_br_chr_show, NULL);
523521

524522
IPL_ATTR_BR_CHR_SHOW_FN(reipl, reipl_block_eckd->eckd);
525523
IPL_ATTR_BR_CHR_STORE_FN(reipl, reipl_block_eckd->eckd);
526524

527525
static struct kobj_attribute sys_reipl_eckd_br_chr_attr =
528-
__ATTR(br_chr, (S_IRUGO | S_IWUSR),
529-
eckd_reipl_br_chr_show,
530-
eckd_reipl_br_chr_store);
526+
__ATTR(br_chr, 0644, eckd_reipl_br_chr_show, eckd_reipl_br_chr_store);
531527

532528
static ssize_t ipl_ccw_loadparm_show(struct kobject *kobj,
533529
struct kobj_attribute *attr, char *page)
@@ -770,11 +766,11 @@ static ssize_t reipl_ccw_vmparm_store(struct kobject *kobj,
770766
}
771767

772768
static struct kobj_attribute sys_reipl_nss_vmparm_attr =
773-
__ATTR(parm, S_IRUGO | S_IWUSR, reipl_nss_vmparm_show,
774-
reipl_nss_vmparm_store);
769+
__ATTR(parm, 0644, reipl_nss_vmparm_show,
770+
reipl_nss_vmparm_store);
775771
static struct kobj_attribute sys_reipl_ccw_vmparm_attr =
776-
__ATTR(parm, S_IRUGO | S_IWUSR, reipl_ccw_vmparm_show,
777-
reipl_ccw_vmparm_store);
772+
__ATTR(parm, 0644, reipl_ccw_vmparm_show,
773+
reipl_ccw_vmparm_store);
778774

779775
/* FCP reipl device attributes */
780776

@@ -814,7 +810,7 @@ static ssize_t reipl_fcp_scpdata_write(struct file *filp, struct kobject *kobj,
814810
return count;
815811
}
816812
static struct bin_attribute sys_reipl_fcp_scp_data_attr =
817-
__BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_fcp_scpdata_read,
813+
__BIN_ATTR(scp_data, 0644, reipl_fcp_scpdata_read,
818814
reipl_fcp_scpdata_write, DIAG308_SCPDATA_SIZE);
819815

820816
static struct bin_attribute *reipl_fcp_bin_attrs[] = {
@@ -894,8 +890,8 @@ static ssize_t reipl_fcp_loadparm_store(struct kobject *kobj,
894890
}
895891

896892
static struct kobj_attribute sys_reipl_fcp_loadparm_attr =
897-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_fcp_loadparm_show,
898-
reipl_fcp_loadparm_store);
893+
__ATTR(loadparm, 0644, reipl_fcp_loadparm_show,
894+
reipl_fcp_loadparm_store);
899895

900896
static ssize_t reipl_fcp_clear_show(struct kobject *kobj,
901897
struct kobj_attribute *attr, char *page)
@@ -968,7 +964,7 @@ static ssize_t reipl_nvme_scpdata_write(struct file *filp, struct kobject *kobj,
968964
}
969965

970966
static struct bin_attribute sys_reipl_nvme_scp_data_attr =
971-
__BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_nvme_scpdata_read,
967+
__BIN_ATTR(scp_data, 0644, reipl_nvme_scpdata_read,
972968
reipl_nvme_scpdata_write, DIAG308_SCPDATA_SIZE);
973969

974970
static struct bin_attribute *reipl_nvme_bin_attrs[] = {
@@ -1000,8 +996,8 @@ static ssize_t reipl_nvme_loadparm_store(struct kobject *kobj,
1000996
}
1001997

1002998
static struct kobj_attribute sys_reipl_nvme_loadparm_attr =
1003-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_nvme_loadparm_show,
1004-
reipl_nvme_loadparm_store);
999+
__ATTR(loadparm, 0644, reipl_nvme_loadparm_show,
1000+
reipl_nvme_loadparm_store);
10051001

10061002
static struct attribute *reipl_nvme_attrs[] = {
10071003
&sys_reipl_nvme_fid_attr.attr,
@@ -1067,8 +1063,8 @@ static ssize_t reipl_ccw_loadparm_store(struct kobject *kobj,
10671063
}
10681064

10691065
static struct kobj_attribute sys_reipl_ccw_loadparm_attr =
1070-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_ccw_loadparm_show,
1071-
reipl_ccw_loadparm_store);
1066+
__ATTR(loadparm, 0644, reipl_ccw_loadparm_show,
1067+
reipl_ccw_loadparm_store);
10721068

10731069
static ssize_t reipl_ccw_clear_show(struct kobject *kobj,
10741070
struct kobj_attribute *attr, char *page)
@@ -1151,7 +1147,7 @@ static ssize_t reipl_eckd_scpdata_write(struct file *filp, struct kobject *kobj,
11511147
}
11521148

11531149
static struct bin_attribute sys_reipl_eckd_scp_data_attr =
1154-
__BIN_ATTR(scp_data, (S_IRUGO | S_IWUSR), reipl_eckd_scpdata_read,
1150+
__BIN_ATTR(scp_data, 0644, reipl_eckd_scpdata_read,
11551151
reipl_eckd_scpdata_write, DIAG308_SCPDATA_SIZE);
11561152

11571153
static struct bin_attribute *reipl_eckd_bin_attrs[] = {
@@ -1239,12 +1235,12 @@ static ssize_t reipl_nss_name_store(struct kobject *kobj,
12391235
}
12401236

12411237
static struct kobj_attribute sys_reipl_nss_name_attr =
1242-
__ATTR(name, S_IRUGO | S_IWUSR, reipl_nss_name_show,
1243-
reipl_nss_name_store);
1238+
__ATTR(name, 0644, reipl_nss_name_show,
1239+
reipl_nss_name_store);
12441240

12451241
static struct kobj_attribute sys_reipl_nss_loadparm_attr =
1246-
__ATTR(loadparm, S_IRUGO | S_IWUSR, reipl_nss_loadparm_show,
1247-
reipl_nss_loadparm_store);
1242+
__ATTR(loadparm, 0644, reipl_nss_loadparm_show,
1243+
reipl_nss_loadparm_store);
12481244

12491245
static struct attribute *reipl_nss_attrs[] = {
12501246
&sys_reipl_nss_name_attr.attr,

0 commit comments

Comments
 (0)