@@ -146,15 +146,15 @@ static ssize_t csrow_ue_count_show(struct device *dev,
146
146
{
147
147
struct csrow_info * csrow = to_csrow (dev );
148
148
149
- return sprintf (data , "%u\n" , csrow -> ue_count );
149
+ return sysfs_emit (data , "%u\n" , csrow -> ue_count );
150
150
}
151
151
152
152
static ssize_t csrow_ce_count_show (struct device * dev ,
153
153
struct device_attribute * mattr , char * data )
154
154
{
155
155
struct csrow_info * csrow = to_csrow (dev );
156
156
157
- return sprintf (data , "%u\n" , csrow -> ce_count );
157
+ return sysfs_emit (data , "%u\n" , csrow -> ce_count );
158
158
}
159
159
160
160
static ssize_t csrow_size_show (struct device * dev ,
@@ -166,23 +166,23 @@ static ssize_t csrow_size_show(struct device *dev,
166
166
167
167
for (i = 0 ; i < csrow -> nr_channels ; i ++ )
168
168
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 ));
170
170
}
171
171
172
172
static ssize_t csrow_mem_type_show (struct device * dev ,
173
173
struct device_attribute * mattr , char * data )
174
174
{
175
175
struct csrow_info * csrow = to_csrow (dev );
176
176
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 ]);
178
178
}
179
179
180
180
static ssize_t csrow_dev_type_show (struct device * dev ,
181
181
struct device_attribute * mattr , char * data )
182
182
{
183
183
struct csrow_info * csrow = to_csrow (dev );
184
184
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 ]);
186
186
}
187
187
188
188
static ssize_t csrow_edac_mode_show (struct device * dev ,
@@ -191,7 +191,7 @@ static ssize_t csrow_edac_mode_show(struct device *dev,
191
191
{
192
192
struct csrow_info * csrow = to_csrow (dev );
193
193
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 ]);
195
195
}
196
196
197
197
/* show/store functions for DIMM Label attributes */
@@ -207,8 +207,7 @@ static ssize_t channel_dimm_label_show(struct device *dev,
207
207
if (!rank -> dimm -> label [0 ])
208
208
return 0 ;
209
209
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 );
212
211
}
213
212
214
213
static ssize_t channel_dimm_label_store (struct device * dev ,
@@ -243,7 +242,7 @@ static ssize_t channel_ce_count_show(struct device *dev,
243
242
unsigned int chan = to_channel (mattr );
244
243
struct rank_info * rank = csrow -> channels [chan ];
245
244
246
- return sprintf (data , "%u\n" , rank -> ce_count );
245
+ return sysfs_emit (data , "%u\n" , rank -> ce_count );
247
246
}
248
247
249
248
/* cwrow<id>/attribute files */
@@ -515,7 +514,7 @@ static ssize_t dimmdev_label_show(struct device *dev,
515
514
if (!dimm -> label [0 ])
516
515
return 0 ;
517
516
518
- return snprintf (data , sizeof ( dimm -> label ) + 1 , "%s\n" , dimm -> label );
517
+ return sysfs_emit (data , "%s\n" , dimm -> label );
519
518
}
520
519
521
520
static ssize_t dimmdev_label_store (struct device * dev ,
@@ -546,23 +545,23 @@ static ssize_t dimmdev_size_show(struct device *dev,
546
545
{
547
546
struct dimm_info * dimm = to_dimm (dev );
548
547
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 ));
550
549
}
551
550
552
551
static ssize_t dimmdev_mem_type_show (struct device * dev ,
553
552
struct device_attribute * mattr , char * data )
554
553
{
555
554
struct dimm_info * dimm = to_dimm (dev );
556
555
557
- return sprintf (data , "%s\n" , edac_mem_types [dimm -> mtype ]);
556
+ return sysfs_emit (data , "%s\n" , edac_mem_types [dimm -> mtype ]);
558
557
}
559
558
560
559
static ssize_t dimmdev_dev_type_show (struct device * dev ,
561
560
struct device_attribute * mattr , char * data )
562
561
{
563
562
struct dimm_info * dimm = to_dimm (dev );
564
563
565
- return sprintf (data , "%s\n" , dev_types [dimm -> dtype ]);
564
+ return sysfs_emit (data , "%s\n" , dev_types [dimm -> dtype ]);
566
565
}
567
566
568
567
static ssize_t dimmdev_edac_mode_show (struct device * dev ,
@@ -571,7 +570,7 @@ static ssize_t dimmdev_edac_mode_show(struct device *dev,
571
570
{
572
571
struct dimm_info * dimm = to_dimm (dev );
573
572
574
- return sprintf (data , "%s\n" , edac_caps [dimm -> edac_mode ]);
573
+ return sysfs_emit (data , "%s\n" , edac_caps [dimm -> edac_mode ]);
575
574
}
576
575
577
576
static ssize_t dimmdev_ce_count_show (struct device * dev ,
@@ -580,7 +579,7 @@ static ssize_t dimmdev_ce_count_show(struct device *dev,
580
579
{
581
580
struct dimm_info * dimm = to_dimm (dev );
582
581
583
- return sprintf (data , "%u\n" , dimm -> ce_count );
582
+ return sysfs_emit (data , "%u\n" , dimm -> ce_count );
584
583
}
585
584
586
585
static ssize_t dimmdev_ue_count_show (struct device * dev ,
@@ -589,7 +588,7 @@ static ssize_t dimmdev_ue_count_show(struct device *dev,
589
588
{
590
589
struct dimm_info * dimm = to_dimm (dev );
591
590
592
- return sprintf (data , "%u\n" , dimm -> ue_count );
591
+ return sysfs_emit (data , "%u\n" , dimm -> ue_count );
593
592
}
594
593
595
594
/* dimm/rank attribute files */
@@ -758,7 +757,7 @@ static ssize_t mci_sdram_scrub_rate_show(struct device *dev,
758
757
return bandwidth ;
759
758
}
760
759
761
- return sprintf (data , "%d\n" , bandwidth );
760
+ return sysfs_emit (data , "%d\n" , bandwidth );
762
761
}
763
762
764
763
/* default attribute files for the MCI object */
@@ -768,7 +767,7 @@ static ssize_t mci_ue_count_show(struct device *dev,
768
767
{
769
768
struct mem_ctl_info * mci = to_mci (dev );
770
769
771
- return sprintf (data , "%u\n" , mci -> ue_mc );
770
+ return sysfs_emit (data , "%u\n" , mci -> ue_mc );
772
771
}
773
772
774
773
static ssize_t mci_ce_count_show (struct device * dev ,
@@ -777,7 +776,7 @@ static ssize_t mci_ce_count_show(struct device *dev,
777
776
{
778
777
struct mem_ctl_info * mci = to_mci (dev );
779
778
780
- return sprintf (data , "%u\n" , mci -> ce_mc );
779
+ return sysfs_emit (data , "%u\n" , mci -> ce_mc );
781
780
}
782
781
783
782
static ssize_t mci_ce_noinfo_show (struct device * dev ,
@@ -786,7 +785,7 @@ static ssize_t mci_ce_noinfo_show(struct device *dev,
786
785
{
787
786
struct mem_ctl_info * mci = to_mci (dev );
788
787
789
- return sprintf (data , "%u\n" , mci -> ce_noinfo_count );
788
+ return sysfs_emit (data , "%u\n" , mci -> ce_noinfo_count );
790
789
}
791
790
792
791
static ssize_t mci_ue_noinfo_show (struct device * dev ,
@@ -795,7 +794,7 @@ static ssize_t mci_ue_noinfo_show(struct device *dev,
795
794
{
796
795
struct mem_ctl_info * mci = to_mci (dev );
797
796
798
- return sprintf (data , "%u\n" , mci -> ue_noinfo_count );
797
+ return sysfs_emit (data , "%u\n" , mci -> ue_noinfo_count );
799
798
}
800
799
801
800
static ssize_t mci_seconds_show (struct device * dev ,
@@ -804,7 +803,7 @@ static ssize_t mci_seconds_show(struct device *dev,
804
803
{
805
804
struct mem_ctl_info * mci = to_mci (dev );
806
805
807
- return sprintf (data , "%ld\n" , (jiffies - mci -> start_time ) / HZ );
806
+ return sysfs_emit (data , "%ld\n" , (jiffies - mci -> start_time ) / HZ );
808
807
}
809
808
810
809
static ssize_t mci_ctl_name_show (struct device * dev ,
@@ -813,7 +812,7 @@ static ssize_t mci_ctl_name_show(struct device *dev,
813
812
{
814
813
struct mem_ctl_info * mci = to_mci (dev );
815
814
816
- return sprintf (data , "%s\n" , mci -> ctl_name );
815
+ return sysfs_emit (data , "%s\n" , mci -> ctl_name );
817
816
}
818
817
819
818
static ssize_t mci_size_mb_show (struct device * dev ,
@@ -833,7 +832,7 @@ static ssize_t mci_size_mb_show(struct device *dev,
833
832
}
834
833
}
835
834
836
- return sprintf (data , "%u\n" , PAGES_TO_MiB (total_pages ));
835
+ return sysfs_emit (data , "%u\n" , PAGES_TO_MiB (total_pages ));
837
836
}
838
837
839
838
static ssize_t mci_max_location_show (struct device * dev ,
0 commit comments