mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 00:22:00 +02:00
s390/time: Switch over to sysfs_emit()
Per Documentation/filesystems/sysfs.rst, sysfs_emit() is preferred over sprintf for presenting attributes to user space. Convert the left-over uses in the s390/time code. Signed-off-by: Mete Durlu <meted@linux.ibm.com> Reviewed-by: Gerd Bayer <gbayer@linux.ibm.com> Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
parent
f94de4f17b
commit
b4b920cded
|
|
@ -729,8 +729,8 @@ static ssize_t ctn_id_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid())
|
||||
ret = sprintf(buf, "%016lx\n",
|
||||
*(unsigned long *) stp_info.ctnid);
|
||||
ret = sysfs_emit(buf, "%016lx\n",
|
||||
*(unsigned long *)stp_info.ctnid);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -745,7 +745,7 @@ static ssize_t ctn_type_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid())
|
||||
ret = sprintf(buf, "%i\n", stp_info.ctn);
|
||||
ret = sysfs_emit(buf, "%i\n", stp_info.ctn);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -760,7 +760,7 @@ static ssize_t dst_offset_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid() && (stp_info.vbits & 0x2000))
|
||||
ret = sprintf(buf, "%i\n", (int)(s16) stp_info.dsto);
|
||||
ret = sysfs_emit(buf, "%i\n", (int)(s16)stp_info.dsto);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -775,7 +775,7 @@ static ssize_t leap_seconds_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid() && (stp_info.vbits & 0x8000))
|
||||
ret = sprintf(buf, "%i\n", (int)(s16) stp_info.leaps);
|
||||
ret = sysfs_emit(buf, "%i\n", (int)(s16)stp_info.leaps);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -801,11 +801,11 @@ static ssize_t leap_seconds_scheduled_show(struct device *dev,
|
|||
return ret;
|
||||
|
||||
if (!stzi.lsoib.p)
|
||||
return sprintf(buf, "0,0\n");
|
||||
return sysfs_emit(buf, "0,0\n");
|
||||
|
||||
return sprintf(buf, "%lu,%d\n",
|
||||
tod_to_ns(stzi.lsoib.nlsout - TOD_UNIX_EPOCH) / NSEC_PER_SEC,
|
||||
stzi.lsoib.nlso - stzi.lsoib.also);
|
||||
return sysfs_emit(buf, "%lu,%d\n",
|
||||
tod_to_ns(stzi.lsoib.nlsout - TOD_UNIX_EPOCH) / NSEC_PER_SEC,
|
||||
stzi.lsoib.nlso - stzi.lsoib.also);
|
||||
}
|
||||
|
||||
static DEVICE_ATTR_RO(leap_seconds_scheduled);
|
||||
|
|
@ -818,7 +818,7 @@ static ssize_t stratum_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid())
|
||||
ret = sprintf(buf, "%i\n", (int)(s16) stp_info.stratum);
|
||||
ret = sysfs_emit(buf, "%i\n", (int)(s16)stp_info.stratum);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -833,7 +833,7 @@ static ssize_t time_offset_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid() && (stp_info.vbits & 0x0800))
|
||||
ret = sprintf(buf, "%i\n", (int) stp_info.tto);
|
||||
ret = sysfs_emit(buf, "%i\n", (int)stp_info.tto);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -848,7 +848,7 @@ static ssize_t time_zone_offset_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid() && (stp_info.vbits & 0x4000))
|
||||
ret = sprintf(buf, "%i\n", (int)(s16) stp_info.tzo);
|
||||
ret = sysfs_emit(buf, "%i\n", (int)(s16)stp_info.tzo);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -863,7 +863,7 @@ static ssize_t timing_mode_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid())
|
||||
ret = sprintf(buf, "%i\n", stp_info.tmd);
|
||||
ret = sysfs_emit(buf, "%i\n", stp_info.tmd);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -878,7 +878,7 @@ static ssize_t timing_state_show(struct device *dev,
|
|||
|
||||
mutex_lock(&stp_mutex);
|
||||
if (stpinfo_valid())
|
||||
ret = sprintf(buf, "%i\n", stp_info.tst);
|
||||
ret = sysfs_emit(buf, "%i\n", stp_info.tst);
|
||||
mutex_unlock(&stp_mutex);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -889,7 +889,7 @@ static ssize_t online_show(struct device *dev,
|
|||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
return sprintf(buf, "%i\n", stp_online);
|
||||
return sysfs_emit(buf, "%i\n", stp_online);
|
||||
}
|
||||
|
||||
static ssize_t online_store(struct device *dev,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user