ASoC: Replace sprintf() with sysfs_emit()
Subsystems (7)
cover ASoC: Replace sprintf() with sysfs_emit()
Hi,
this is a patch set for rather simple conversions from the plain sprintf() & co to the new helpers, sysfs_emit() and sysfs_emit_at(). No functional changes are expected.
Takashi
===
Takashi Iwai (8):
ASoC: cs43130: Replace scnprintf() with sysfs_emit()
ASoC: tlv320aic26: Replace sprintf() with sysfs_emit()
ASoC: Intel: sst: Replace sprintf() with sysfs_emit()
ASoC: Intel: catpt: Replace sprintf() with sysfs_emit()
ASoC: Intel: skylake: Replace sprintf() with sysfs_emit()
ASoC: core: Replace sprintf() with sysfs_emit()
ASoC: DAPM: Replace sprintf() calls with sysfs_emit_at()
ASoC: omap: Replace sprintf() with sysfs_emit()
sound/soc/codecs/cs43130.c | 11 +++++------ sound/soc/codecs/tlv320aic26.c | 2 +- sound/soc/intel/atom/sst/sst.c | 8 ++++---- sound/soc/intel/catpt/sysfs.c | 6 +++--- sound/soc/intel/skylake/skl-nhlt.c | 2 +- sound/soc/soc-core.c | 2 +- sound/soc/soc-dapm.c | 9 ++++----- sound/soc/ti/omap-mcbsp-st.c | 6 +++--- sound/soc/ti/omap-mcbsp.c | 8 ++++---- 9 files changed, 26 insertions(+), 28 deletions(-)
Signature · 1 line
2.35.3
PATCH 1/8 ASoC: cs43130: Replace scnprintf() with sysfs_emit()
sysfs_emit() is a new helper to simplify the sysfs string output. Replace the open-code straightforwardly with this new helper.
--- sound/soc/codecs/cs43130.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
sound/soc/codecs/cs43130.c +5 -6
@@ -1666,10 +1666,9 @@ static int cs43130_show_dc(struct device *dev, char *buf, u8 ch)struct cs43130_private *cs43130 =i2c_get_clientdata (client);if (!cs43130->hpload_done) -return scnprintf (buf,PAGE_SIZE ,"NO_HPLOAD\n" ); +return sysfs_emit (buf,"NO_HPLOAD\n" );else -return scnprintf (buf,PAGE_SIZE ,"%u\n" , - cs43130->hpload_dc[ch]); +return sysfs_emit (buf,"%u\n" , cs43130->hpload_dc[ch]); } static ssize_t hpload_dc_l_show(struct device *dev,
@@ -1705,8 +1704,8 @@ static int cs43130_show_ac(struct device *dev, char *buf, u8 ch)if (cs43130->hpload_done && cs43130->ac_meas) {for (i =0 ; i <ARRAY_SIZE (cs43130_ac_freq); i++) { - tmp =scnprintf (buf + j,PAGE_SIZE - j,"%u\n" , - cs43130->hpload_ac[i][ch]); + tmp =sysfs_emit_at (buf, j,"%u\n" , + cs43130->hpload_ac[i][ch]);if (!tmp)break ;
@@ -1715,7 +1714,7 @@ static int cs43130_show_ac(struct device *dev, char *buf, u8 ch)return j; }else { -return scnprintf (buf,PAGE_SIZE ,"NO_HPLOAD\n" ); +return sysfs_emit (buf,"NO_HPLOAD\n" ); } }
Signature · 1 line
2.35.3
PATCH 2/8 ASoC: tlv320aic26: Replace sprintf() with sysfs_emit()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces the sprintf() usage straightforwardly with a new helper, sysfs_emit().
--- sound/soc/codecs/tlv320aic26.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tlv320aic26.c +1 -1
@@ -271,7 +271,7 @@ static ssize_t keyclick_show(struct device *dev, freq = (125 << ((val >>8 ) &0x7 )) >>1 ; len =2 * (1 + ((val >>4 ) &0xf )); -return sprintf (buf,"amp=%x freq=%iHz len=%iclks\n" , amp, freq, len); +return sysfs_emit (buf,"amp=%x freq=%iHz len=%iclks\n" , amp, freq, len); }/* Any write to the keyclick attribute will trigger the keyclick event */
Signature · 1 line
2.35.3
PATCH 3/8 ASoC: Intel: sst: Replace sprintf() with sysfs_emit()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces those usages straightforwardly with a new helper, sysfs_emit().
--- sound/soc/intel/atom/sst/sst.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/atom/sst/sst.c +4 -4
@@ -242,11 +242,11 @@ static ssize_t firmware_version_show(struct device *dev,if (ctx->fw_version.type ==0 && ctx->fw_version.major ==0 && ctx->fw_version.minor ==0 && ctx->fw_version.build ==0 ) -return sprintf (buf,"FW not yet loaded\n" ); +return sysfs_emit (buf,"FW not yet loaded\n" );else -return sprintf (buf,"v%02x.%02x.%02x.%02x\n" , - ctx->fw_version.type, ctx->fw_version.major, - ctx->fw_version.minor, ctx->fw_version.build); +return sysfs_emit (buf,"v%02x.%02x.%02x.%02x\n" , + ctx->fw_version.type, ctx->fw_version.major, + ctx->fw_version.minor, ctx->fw_version.build); }
Signature · 1 line
2.35.3
PATCH 4/8 ASoC: Intel: catpt: Replace sprintf() with sysfs_emit()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces those usages straightforwardly with a new helper, sysfs_emit().
--- sound/soc/intel/catpt/sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/catpt/sysfs.c +3 -3
@@ -27,8 +27,8 @@ static ssize_t fw_version_show(struct device *dev,if (ret)return CATPT_IPC_ERROR (ret); -return sprintf (buf,"%d.%d.%d.%d\n" , version.type, version.major, - version.minor, version.build); +return sysfs_emit (buf,"%d.%d.%d.%d\n" , version.type, version.major, + version.minor, version.build); }static DEVICE_ATTR_RO (fw_version);
@@ -37,7 +37,7 @@ static ssize_t fw_info_show(struct device *dev, {struct catpt_dev *cdev =dev_get_drvdata (dev); -return sprintf (buf,"%s\n" , cdev->ipc.config.fw_info); +return sysfs_emit (buf,"%s\n" , cdev->ipc.config.fw_info); }static DEVICE_ATTR_RO (fw_info);
Signature · 1 line
2.35.3
Re: [PATCH 4/8] ASoC: Intel: catpt: Replace sprintf() with sysfs_emit()
Quoted 3 lines · Takashi Iwai
For sysfs outputs, it's safer to use a new helper,
sysfs_emit(), instead of the rawsprintf()& co. This patch replaces those usages straightforwardly with a new helper,sysfs_emit().
PATCH 5/8 ASoC: Intel: skylake: Replace sprintf() with sysfs_emit()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces those usages straightforwardly with a new helper, sysfs_emit().
--- sound/soc/intel/skylake/skl-nhlt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-nhlt.c +1 -1
@@ -61,7 +61,7 @@ static ssize_t platform_id_show(struct device *dev, nhlt->header.oem_revision);skl_nhlt_trim_space (platform_id); -return sprintf (buf,"%s\n" , platform_id); +return sysfs_emit (buf,"%s\n" , platform_id); }static DEVICE_ATTR_RO (platform_id);
Signature · 1 line
2.35.3
Re: [PATCH 5/8] ASoC: Intel: skylake: Replace sprintf() with sysfs_emit()
Quoted 3 lines · Takashi Iwai
For sysfs outputs, it's safer to use a new helper,
sysfs_emit(), instead of the rawsprintf()& co. This patch replaces those usages straightforwardly with a new helper,sysfs_emit().
PATCH 6/8 ASoC: core: Replace sprintf() with sysfs_emit()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces the sprintf() usage straightforwardly with a new helper, sysfs_emit().
--- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-core.c +1 -1
@@ -72,7 +72,7 @@ static ssize_t pmdown_time_show(struct device *dev, {struct snd_soc_pcm_runtime *rtd =dev_get_drvdata (dev); -return sprintf (buf,"%ld\n" , rtd->pmdown_time); +return sysfs_emit (buf,"%ld\n" , rtd->pmdown_time); } static ssize_t pmdown_time_store(struct device *dev,
Signature · 1 line
2.35.3
PATCH 7/8 ASoC: DAPM: Replace sprintf() calls with sysfs_emit_at()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces the open-code with a new helper, sysfs_emit_at(), by passing the string offset.
--- sound/soc/soc-dapm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
sound/soc/soc-dapm.c +4 -5
@@ -2386,11 +2386,10 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm,EXPORT_SYMBOL_GPL (snd_soc_dapm_mixer_update_power);static ssize_t dapm_widget_show_component (struct snd_soc_component *cmpnt, -char *buf) +char *buf,int count) {struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (cmpnt);struct snd_soc_dapm_widget *w; -int count =0 ;char *state ="not set" ;/* card won't be set for the dummy component, as a spot fix
@@ -2423,7 +2422,7 @@ static ssize_t dapm_widget_show_component(struct snd_soc_component *cmpnt,case snd_soc_dapm_pinctrl:case snd_soc_dapm_clock_supply:if (w->name) - count +=sprintf (buf + count,"%s: %s\n" , + count +=sysfs_emit_at (buf, count,"%s: %s\n" , w->name, w->power ?"On" :"Off" );break ;default :
@@ -2445,7 +2444,7 @@ static ssize_t dapm_widget_show_component(struct snd_soc_component *cmpnt, state ="Off" ;break ; } - count +=sprintf (buf + count,"PM State: %s\n" , state); + count +=sysfs_emit_at (buf, count,"PM State: %s\n" , state);return count; }
@@ -2463,7 +2462,7 @@ static ssize_t dapm_widget_show(struct device *dev,for_each_rtd_codec_dais (rtd, i, codec_dai) {struct snd_soc_component *cmpnt = codec_dai->component; - count +=dapm_widget_show_component (cmpnt, buf + count); + count =dapm_widget_show_component (cmpnt, buf, count); }mutex_unlock (&rtd->card->dapm_mutex);
Signature · 1 line
2.35.3
PATCH 8/8 ASoC: omap: Replace sprintf() with sysfs_emit()
In reply to Takashi IwaiFor sysfs outputs, it's safer to use a new helper, sysfs_emit(), instead of the raw sprintf() & co. This patch replaces the open code with new helpers, sysfs_emit() and sysfs_emit_at(), with the proper string offset.
--- sound/soc/ti/omap-mcbsp-st.c | 6 +++--- sound/soc/ti/omap-mcbsp.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
sound/soc/ti/omap-mcbsp-st.c +3 -3
@@ -244,10 +244,10 @@ static ssize_t st_taps_show(struct device *dev,spin_lock_irq (&mcbsp->lock);for (i =0 ; i < st_data->nr_taps; i++) - status +=sprintf (&buf[status], (i ?", %d" :"%d" ), - st_data->taps[i]); + status +=sysfs_emit_at (buf, status, (i ?", %d" :"%d" ), + st_data->taps[i]);if (i) - status +=sprintf (&buf[status],"\n" ); + status +=sysfs_emit_at (buf, status,"\n" );spin_unlock_irq (&mcbsp->lock);return status;
sound/soc/ti/omap-mcbsp.c +4 -4
@@ -517,7 +517,7 @@ static ssize_t prop##_show(struct device *dev, \ { \struct omap_mcbsp *mcbsp =dev_get_drvdata (dev); \ \ -return sprintf (buf,"%u\n" , mcbsp->prop); \ +return sysfs_emit (buf,"%u\n" , mcbsp->prop); \ } \ \ static ssize_t prop##_store(struct device *dev, \
@@ -560,11 +560,11 @@ static ssize_t dma_op_mode_show(struct device *dev,for (s = &dma_op_modes[i]; i <ARRAY_SIZE (dma_op_modes); s++, i++) {if (dma_op_mode == i) - len +=sprintf (buf + len,"[%s] " , *s); + len +=sysfs_emit_at (buf, len,"[%s] " , *s);else - len +=sprintf (buf + len,"%s " , *s); + len +=sysfs_emit_at (buf, len,"%s " , *s); } - len +=sprintf (buf + len,"\n" ); + len +=sysfs_emit_at (buf, len,"\n" );return len; }
Signature · 1 line
2.35.3
Re: [PATCH 8/8] ASoC: omap: Replace sprintf() with sysfs_emit()
Quoted 4 lines · Takashi Iwai
For sysfs outputs, it's safer to use a new helper,
sysfs_emit(), instead of the rawsprintf()& co. This patch replaces the open code with new helpers,sysfs_emit()andsysfs_emit_at(), with the proper string offset.
Quoted 53 lines
Signed-off-by Takashi Iwai <[email protected]>--- sound/soc/ti/omap-mcbsp-st.c | 6 +++--- sound/soc/ti/omap-mcbsp.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)sound/soc/ti/omap-mcbsp-st.c +3
-3@@ -244,10 +244,10 @@ static ssize_t st_taps_show(struct device *dev,spin_lock_irq (&mcbsp->lock);for (i =0 ; i < st_data->nr_taps; i++) - status +=sprintf (&buf[status], (i ?", %d" :"%d" ), - st_data->taps[i]); + status +=sysfs_emit_at (buf, status, (i ?", %d" :"%d" ), + st_data->taps[i]);if (i) - status +=sprintf (&buf[status],"\n" ); + status +=sysfs_emit_at (buf, status,"\n" );spin_unlock_irq (&mcbsp->lock);return status;sound/soc/ti/omap-mcbsp.c +4
-4@@ -517,7 +517,7 @@ static ssize_t prop##_show(struct device *dev, \ { \struct omap_mcbsp *mcbsp =dev_get_drvdata (dev); \ \ -return sprintf (buf,"%u\n" , mcbsp->prop); \ +return sysfs_emit (buf,"%u\n" , mcbsp->prop); \ } \ \ static ssize_t prop##_store(struct device *dev, \@@ -560,11 +560,11 @@ static ssize_t dma_op_mode_show(struct device *dev,for (s = &dma_op_modes[i]; i <ARRAY_SIZE (dma_op_modes); s++, i++) {if (dma_op_mode == i) - len +=sprintf (buf + len,"[%s] " , *s); + len +=sysfs_emit_at (buf, len,"[%s] " , *s);else - len +=sprintf (buf + len,"%s " , *s); + len +=sysfs_emit_at (buf, len,"%s " , *s); } - len +=sprintf (buf + len,"\n" ); + len +=sysfs_emit_at (buf, len,"\n" );return len; }
Signature · 1 line
Péter
Mark Brown
maintainerQuoted 8 lines · Takashi Iwai
this is a patch set for rather simple conversions from the plain
sprintf()& co to the new helpers,sysfs_emit()andsysfs_emit_at(). No functional changes are expected.Takashi
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/8] ASoC: cs43130: Replace scnprintf() with sysfs_emit()
commit: 32d3679cbb383478c7e9dff590f367f1d7dda975
[2/8] ASoC: tlv320aic26: Replace sprintf() with sysfs_emit()
commit: 1218d67d376156aa8dc9dbc39616867823f60783
[3/8] ASoC: Intel: sst: Replace sprintf() with sysfs_emit()
commit: 0aab7bda03086061abd5f8a7794324bb70f769a3
[4/8] ASoC: Intel: catpt: Replace sprintf() with sysfs_emit()
commit: 7ae8d8ea9427b6fb1ed04b02faf31ad5e3a6de8b
[5/8] ASoC: Intel: skylake: Replace sprintf() with sysfs_emit()
commit: 11af2b1e33e8c9e72ddf14cd61f9494f34e06c40
[6/8] ASoC: core: Replace sprintf() with sysfs_emit()
commit: 628d0f72d5828611cae353bd8b49d7647711c283
[7/8] ASoC: DAPM: Replace sprintf() calls with sysfs_emit_at()
commit: 69f7cbfb08c7ee2ca565f532b0073b847db20bdc
[8/8] ASoC: omap: Replace sprintf() with sysfs_emit()
commit: a111ae4d7f0796cf2ea0e8bf3ab6c06a401e0560All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark