Skip to content

Commit d7518ad

Browse files
zhijianli88bp3tk0v
authored andcommitted
EDAC/mc_sysfs: Convert sprintf()/snprintf() to sysfs_emit()
Per Documentation/filesystems/sysfs.rst, show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Generated by: make coccicheck M=<path/to/file> MODE=patch \ COCCI=scripts/coccinelle/api/device_attr_show.cocci No functional change intended. [ bp: Massage. ] Signed-off-by: Li Zhijian <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c8d3708 commit d7518ad

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

drivers/edac/edac_mc_sysfs.c

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ static ssize_t csrow_ue_count_show(struct device *dev,
146146
{
147147
struct csrow_info *csrow = to_csrow(dev);
148148

149-
return sprintf(data, "%u\n", csrow->ue_count);
149+
return sysfs_emit(data, "%u\n", csrow->ue_count);
150150
}
151151

152152
static ssize_t csrow_ce_count_show(struct device *dev,
153153
struct device_attribute *mattr, char *data)
154154
{
155155
struct csrow_info *csrow = to_csrow(dev);
156156

157-
return sprintf(data, "%u\n", csrow->ce_count);
157+
return sysfs_emit(data, "%u\n", csrow->ce_count);
158158
}
159159

160160
static ssize_t csrow_size_show(struct device *dev,
@@ -166,23 +166,23 @@ static ssize_t csrow_size_show(struct device *dev,
166166

167167
for (i = 0; i < csrow->nr_channels; i++)
168168
nr_pages += csrow->channels[i]->dimm->nr_pages;
169-
return sprintf(data, "%u\n", PAGES_TO_MiB(nr_pages));
169+
return sysfs_emit(data, "%u\n", PAGES_TO_MiB(nr_pages));
170170
}
171171

172172
static ssize_t csrow_mem_type_show(struct device *dev,
173173
struct device_attribute *mattr, char *data)
174174
{
175175
struct csrow_info *csrow = to_csrow(dev);
176176

177-
return sprintf(data, "%s\n", edac_mem_types[csrow->channels[0]->dimm->mtype]);
177+
return sysfs_emit(data, "%s\n", edac_mem_types[csrow->channels[0]->dimm->mtype]);
178178
}
179179

180180
static ssize_t csrow_dev_type_show(struct device *dev,
181181
struct device_attribute *mattr, char *data)
182182
{
183183
struct csrow_info *csrow = to_csrow(dev);
184184

185-
return sprintf(data, "%s\n", dev_types[csrow->channels[0]->dimm->dtype]);
185+
return sysfs_emit(data, "%s\n", dev_types[csrow->channels[0]->dimm->dtype]);
186186
}
187187

188188
static ssize_t csrow_edac_mode_show(struct device *dev,
@@ -191,7 +191,7 @@ static ssize_t csrow_edac_mode_show(struct device *dev,
191191
{
192192
struct csrow_info *csrow = to_csrow(dev);
193193

194-
return sprintf(data, "%s\n", edac_caps[csrow->channels[0]->dimm->edac_mode]);
194+
return sysfs_emit(data, "%s\n", edac_caps[csrow->channels[0]->dimm->edac_mode]);
195195
}
196196

197197
/* show/store functions for DIMM Label attributes */
@@ -207,8 +207,7 @@ static ssize_t channel_dimm_label_show(struct device *dev,
207207
if (!rank->dimm->label[0])
208208
return 0;
209209

210-
return snprintf(data, sizeof(rank->dimm->label) + 1, "%s\n",
211-
rank->dimm->label);
210+
return sysfs_emit(data, "%s\n", rank->dimm->label);
212211
}
213212

214213
static ssize_t channel_dimm_label_store(struct device *dev,
@@ -243,7 +242,7 @@ static ssize_t channel_ce_count_show(struct device *dev,
243242
unsigned int chan = to_channel(mattr);
244243
struct rank_info *rank = csrow->channels[chan];
245244

246-
return sprintf(data, "%u\n", rank->ce_count);
245+
return sysfs_emit(data, "%u\n", rank->ce_count);
247246
}
248247

249248
/* cwrow<id>/attribute files */
@@ -515,7 +514,7 @@ static ssize_t dimmdev_label_show(struct device *dev,
515514
if (!dimm->label[0])
516515
return 0;
517516

518-
return snprintf(data, sizeof(dimm->label) + 1, "%s\n", dimm->label);
517+
return sysfs_emit(data, "%s\n", dimm->label);
519518
}
520519

521520
static ssize_t dimmdev_label_store(struct device *dev,
@@ -546,23 +545,23 @@ static ssize_t dimmdev_size_show(struct device *dev,
546545
{
547546
struct dimm_info *dimm = to_dimm(dev);
548547

549-
return sprintf(data, "%u\n", PAGES_TO_MiB(dimm->nr_pages));
548+
return sysfs_emit(data, "%u\n", PAGES_TO_MiB(dimm->nr_pages));
550549
}
551550

552551
static ssize_t dimmdev_mem_type_show(struct device *dev,
553552
struct device_attribute *mattr, char *data)
554553
{
555554
struct dimm_info *dimm = to_dimm(dev);
556555

557-
return sprintf(data, "%s\n", edac_mem_types[dimm->mtype]);
556+
return sysfs_emit(data, "%s\n", edac_mem_types[dimm->mtype]);
558557
}
559558

560559
static ssize_t dimmdev_dev_type_show(struct device *dev,
561560
struct device_attribute *mattr, char *data)
562561
{
563562
struct dimm_info *dimm = to_dimm(dev);
564563

565-
return sprintf(data, "%s\n", dev_types[dimm->dtype]);
564+
return sysfs_emit(data, "%s\n", dev_types[dimm->dtype]);
566565
}
567566

568567
static ssize_t dimmdev_edac_mode_show(struct device *dev,
@@ -571,7 +570,7 @@ static ssize_t dimmdev_edac_mode_show(struct device *dev,
571570
{
572571
struct dimm_info *dimm = to_dimm(dev);
573572

574-
return sprintf(data, "%s\n", edac_caps[dimm->edac_mode]);
573+
return sysfs_emit(data, "%s\n", edac_caps[dimm->edac_mode]);
575574
}
576575

577576
static ssize_t dimmdev_ce_count_show(struct device *dev,
@@ -580,7 +579,7 @@ static ssize_t dimmdev_ce_count_show(struct device *dev,
580579
{
581580
struct dimm_info *dimm = to_dimm(dev);
582581

583-
return sprintf(data, "%u\n", dimm->ce_count);
582+
return sysfs_emit(data, "%u\n", dimm->ce_count);
584583
}
585584

586585
static ssize_t dimmdev_ue_count_show(struct device *dev,
@@ -589,7 +588,7 @@ static ssize_t dimmdev_ue_count_show(struct device *dev,
589588
{
590589
struct dimm_info *dimm = to_dimm(dev);
591590

592-
return sprintf(data, "%u\n", dimm->ue_count);
591+
return sysfs_emit(data, "%u\n", dimm->ue_count);
593592
}
594593

595594
/* dimm/rank attribute files */
@@ -758,7 +757,7 @@ static ssize_t mci_sdram_scrub_rate_show(struct device *dev,
758757
return bandwidth;
759758
}
760759

761-
return sprintf(data, "%d\n", bandwidth);
760+
return sysfs_emit(data, "%d\n", bandwidth);
762761
}
763762

764763
/* default attribute files for the MCI object */
@@ -768,7 +767,7 @@ static ssize_t mci_ue_count_show(struct device *dev,
768767
{
769768
struct mem_ctl_info *mci = to_mci(dev);
770769

771-
return sprintf(data, "%u\n", mci->ue_mc);
770+
return sysfs_emit(data, "%u\n", mci->ue_mc);
772771
}
773772

774773
static ssize_t mci_ce_count_show(struct device *dev,
@@ -777,7 +776,7 @@ static ssize_t mci_ce_count_show(struct device *dev,
777776
{
778777
struct mem_ctl_info *mci = to_mci(dev);
779778

780-
return sprintf(data, "%u\n", mci->ce_mc);
779+
return sysfs_emit(data, "%u\n", mci->ce_mc);
781780
}
782781

783782
static ssize_t mci_ce_noinfo_show(struct device *dev,
@@ -786,7 +785,7 @@ static ssize_t mci_ce_noinfo_show(struct device *dev,
786785
{
787786
struct mem_ctl_info *mci = to_mci(dev);
788787

789-
return sprintf(data, "%u\n", mci->ce_noinfo_count);
788+
return sysfs_emit(data, "%u\n", mci->ce_noinfo_count);
790789
}
791790

792791
static ssize_t mci_ue_noinfo_show(struct device *dev,
@@ -795,7 +794,7 @@ static ssize_t mci_ue_noinfo_show(struct device *dev,
795794
{
796795
struct mem_ctl_info *mci = to_mci(dev);
797796

798-
return sprintf(data, "%u\n", mci->ue_noinfo_count);
797+
return sysfs_emit(data, "%u\n", mci->ue_noinfo_count);
799798
}
800799

801800
static ssize_t mci_seconds_show(struct device *dev,
@@ -804,7 +803,7 @@ static ssize_t mci_seconds_show(struct device *dev,
804803
{
805804
struct mem_ctl_info *mci = to_mci(dev);
806805

807-
return sprintf(data, "%ld\n", (jiffies - mci->start_time) / HZ);
806+
return sysfs_emit(data, "%ld\n", (jiffies - mci->start_time) / HZ);
808807
}
809808

810809
static ssize_t mci_ctl_name_show(struct device *dev,
@@ -813,7 +812,7 @@ static ssize_t mci_ctl_name_show(struct device *dev,
813812
{
814813
struct mem_ctl_info *mci = to_mci(dev);
815814

816-
return sprintf(data, "%s\n", mci->ctl_name);
815+
return sysfs_emit(data, "%s\n", mci->ctl_name);
817816
}
818817

819818
static ssize_t mci_size_mb_show(struct device *dev,
@@ -833,7 +832,7 @@ static ssize_t mci_size_mb_show(struct device *dev,
833832
}
834833
}
835834

836-
return sprintf(data, "%u\n", PAGES_TO_MiB(total_pages));
835+
return sysfs_emit(data, "%u\n", PAGES_TO_MiB(total_pages));
837836
}
838837

839838
static ssize_t mci_max_location_show(struct device *dev,

0 commit comments

Comments
 (0)