From nobody Sun Oct 5 14:34:08 2025 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61CB64964E for ; Sat, 2 Aug 2025 14:43:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754145790; cv=none; b=eIoynqcTQvERpwtLRkS22mOzrYismBzV8bMrFX2/k/c3jhlrhCuo5xItT6l9XH+CP8GcDvzGxsdt3h40bknSP+6nHY8cUhjkaU6dlkka1w3WqJ8k3yata7QsDgIu5s4riH6OkXg8jV/HA0Tx0q5rVgyj1XaEOkqarVEBO53WKKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754145790; c=relaxed/simple; bh=yB0eQ/e0SOTfNKWXP7Rz4X1cfxmlRHghGxkbVcSF438=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AmAy95LoNbJaW2THDB/cXquP+YaUgptM2xhwf7eL4f9w6nnfvbz4Rqjc1/r04cdYIAHPiWviiTEcBwgfN46Y36NRtV/n3T14OgF4wUahg9TnT5BveUqMp2ZsVxt7TGz7xjprj0xjcGOh6LOiqUW7RlPXmG+DcNvDnSH7b7nsYMk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iHZu/3/v; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iHZu/3/v" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-70749d4c598so27620296d6.0 for ; Sat, 02 Aug 2025 07:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754145786; x=1754750586; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WpGRrLTKdVWD4vEtoSWhoiLbOclys87KfsZQhLM0YqY=; b=iHZu/3/vIqC4edIHse4aWmmk36yDVX705PAUuZItNnVfedBp6znL8M9Lvyk0e+WeiG oyFurlBGL+zOAvBzldTNVoS2hfxB+UHeI8ECMXRj0/aEOpQd4o/CSCVDsoqJ6Grfr6nC bTk2VPEAadwVtdwj0VDSl8ZfsbaNrxLmOQCF9mRERQ34AJtptQFeU/6HvpJ0qKmE5Qi0 JQ3fuFouMqLsARbWb6WmPvSryAbuKm6aqKV+MEH2Lh4TNEof9Wa4A4dbBPjN+xjX1J3t ZLp4xaWZqKLHUO6vVjkEvi4looB/N4UuWWux7dwMxcDbm4hnagVM2AAm/rEzTll5Ngjo eKAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754145786; x=1754750586; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WpGRrLTKdVWD4vEtoSWhoiLbOclys87KfsZQhLM0YqY=; b=tQ7pvBmaGH1m70NEkJB83mauEEbvMVez6QefKCKVD0+d9YL4CJSumr7q56yI9tRZmf Beb+PjtXpzKSBIRwZa/Au/iBoe7z/6OVNOyxDrCMD6q0DwAYrPyxwwwpZ082oF2e5ylx 16OMcM013h8uZaTBr4gatlz9IWooSbPBOrIljfzC+PoWSETl9qbhfo77pRxgsHmVkBX5 xVuPbH1snO3r5QhIaqvm0j+j0GdbZcBM5rVn4HbMbXD/P+pxOxzEhBXisqXmFTJhxK2s NC/qj/bHSr/IIxZayp/21R+Rdbyq5TSRzR2co28Mda6InHSqv9YDTvrpA+QNfj0/mmXp xvvg== X-Forwarded-Encrypted: i=1; AJvYcCXvlJKuUnu5cDMJqnjLJVGCsqsbkcP7aZ4+exZHdzwTwoUu5K+GwlH79QNKZZnIxGe6BLqPW343SIUTyhg=@vger.kernel.org X-Gm-Message-State: AOJu0YwQak3hYGoLfw85zB36pGDQLoTCB5jZgaReAoc6HbVbwA80atC6 tAPq5s77gr4MObm0OVISFvQngyAoJceYbaxpR+2RvSwVtukAYo3K1CXN X-Gm-Gg: ASbGncvEK5rb3TEd6auEpDoXtUgmjQEJLl9XTPU4AFk6Jy49zxC+XskhOT2F9G/8Oz1 VpafrFS9/ju6cswJ8fMHSRzOzpdsEjD0CSe4mlF4p+/Mrn9RUOQBG+TrJzKirtSzPipM1/kNmj2 C1QoF/Krxkao/59F7UXTdEcWJqwdayznuRxqRjyZFh1s1b7OeW+HpW8J4wVEmm0LrjLoUTw1kvo GY27Q+zbtsYA0t0o5FsxC/xX9UC7286vdC5pUNZgrHMT+rP8wmrD/+iuLEhNdSh4vrOSG+rIU64 VLt7fuHoH9xlQr7jw9+lvf8LVFPI0hasOScI18fWTahj0p1coaoUfLIXWKPwwYjCzBcJGRBw91I EiEo0hzr9+x232CL3kROPUL+JIBye/MpyLkjL10ADtWVZyHNds37Q+cBcFs2s X-Google-Smtp-Source: AGHT+IGCTpDAaZSiKyThpMz3C7S96CSeHuGnMzX5SYgv0Wpm2CboWkvR+7ivG5xHdZ7U5q5QLFz9Gg== X-Received: by 2002:a05:6214:5183:b0:709:12b6:5a8f with SMTP id 6a1803df08f44-7093626ce87mr60457086d6.28.1754145785768; Sat, 02 Aug 2025 07:43:05 -0700 (PDT) Received: from fyre-x-redhat96-nsd-2.fyre.ibm.com ([129.41.87.1]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-7077cde8d56sm35658886d6.73.2025.08.02.07.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Aug 2025 07:43:04 -0700 (PDT) From: Chelsy Ratnawat To: suzuki.poulose@arm.com, mike.leach@linaro.org, alexander.shishkin@linux.intel.com, mcoquelin.stm32@gmail.com Cc: james.clark@linaro.org, alexandre.torgue@foss.st.com, coresight@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chelsy Ratnawat Subject: [PATCH v6] coresight: Replace scnprintf/sprintf with sysfs_emit()/sysfs_emit_at() Date: Sat, 2 Aug 2025 07:42:41 -0700 Message-ID: <20250802144241.2414715-1-chelsyratnawat2001@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Documentation/filesystems/sysfs.rst mentions that show() should only use sysfs_emit() or sysfs_emit_at() when formating the value to be returned to user space. So replace scnprintf() with sysfs_emit() Signed-off-by: Chelsy Ratnawat --- Changes in v6:=20 - Fixed build errors in v5: - Replaced undeclared variable 'bu' with 'buf' - Corrected misuse of sysfs_emit() with wrong argument types .../hwtracing/coresight/coresight-cti-sysfs.c | 40 +++--- drivers/hwtracing/coresight/coresight-etb10.c | 2 +- .../hwtracing/coresight/coresight-etm-perf.c | 6 +- .../coresight/coresight-etm3x-sysfs.c | 66 +++++----- .../coresight/coresight-etm4x-sysfs.c | 117 +++++++++--------- .../hwtracing/coresight/coresight-funnel.c | 4 +- drivers/hwtracing/coresight/coresight-stm.c | 10 +- drivers/hwtracing/coresight/coresight-sysfs.c | 6 +- .../hwtracing/coresight/coresight-tmc-core.c | 6 +- drivers/hwtracing/coresight/coresight-tnoc.c | 2 +- drivers/hwtracing/coresight/coresight-trbe.c | 4 +- 11 files changed, 130 insertions(+), 133 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-cti-sysfs.c b/drivers/hw= tracing/coresight/coresight-cti-sysfs.c index 572b80ee96fb..534f78539fb3 100644 --- a/drivers/hwtracing/coresight/coresight-cti-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-cti-sysfs.c @@ -91,9 +91,9 @@ static ssize_t enable_show(struct device *dev, raw_spin_unlock(&drvdata->spinlock); =20 if (powered) - return sprintf(buf, "%d\n", enabled); + return sysfs_emit(buf, "%d\n", enabled); else - return sprintf(buf, "%d\n", !!enable_req); + return sysfs_emit(buf, "%d\n", !!enable_req); } =20 static ssize_t enable_store(struct device *dev, @@ -138,7 +138,7 @@ static ssize_t powered_show(struct device *dev, powered =3D drvdata->config.hw_powered; raw_spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%d\n", powered); + return sysfs_emit(buf, "%d\n", powered); } static DEVICE_ATTR_RO(powered); =20 @@ -147,7 +147,7 @@ static ssize_t ctmid_show(struct device *dev, { struct cti_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 - return sprintf(buf, "%d\n", drvdata->ctidev.ctm_id); + return sysfs_emit(buf, "%d\n", drvdata->ctidev.ctm_id); } static DEVICE_ATTR_RO(ctmid); =20 @@ -157,7 +157,7 @@ static ssize_t nr_trigger_cons_show(struct device *dev, { struct cti_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 - return sprintf(buf, "%d\n", drvdata->ctidev.nr_trig_con); + return sysfs_emit(buf, "%d\n", drvdata->ctidev.nr_trig_con); } static DEVICE_ATTR_RO(nr_trigger_cons); =20 @@ -334,7 +334,7 @@ static ssize_t inout_sel_show(struct device *dev, struct cti_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D (u32)drvdata->config.ctiinout_sel; - return sprintf(buf, "%d\n", val); + return sysfs_emit(buf, "%d\n", val); } =20 static ssize_t inout_sel_store(struct device *dev, @@ -368,7 +368,7 @@ static ssize_t inen_show(struct device *dev, index =3D drvdata->config.ctiinout_sel; val =3D drvdata->config.ctiinen[index]; raw_spin_unlock(&drvdata->spinlock); - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t inen_store(struct device *dev, @@ -407,7 +407,7 @@ static ssize_t outen_show(struct device *dev, index =3D drvdata->config.ctiinout_sel; val =3D drvdata->config.ctiouten[index]; raw_spin_unlock(&drvdata->spinlock); - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t outen_store(struct device *dev, @@ -609,7 +609,7 @@ static ssize_t chan_gate_enable_show(struct device *dev, int size =3D 0; =20 if (cfg->ctigate =3D=3D 0) - size =3D sprintf(buf, "\n"); + size =3D sysfs_emit(buf, "\n"); else size =3D bitmap_print_to_pagebuf(true, buf, &ctigate_bitmask, cfg->nr_ctm_channels); @@ -684,7 +684,7 @@ static ssize_t trig_filter_enable_show(struct device *d= ev, raw_spin_lock(&drvdata->spinlock); val =3D drvdata->config.trig_filter_enable; raw_spin_unlock(&drvdata->spinlock); - return sprintf(buf, "%d\n", val); + return sysfs_emit(buf, "%d\n", val); } =20 static ssize_t trig_filter_enable_store(struct device *dev, @@ -785,7 +785,7 @@ static ssize_t chan_xtrigs_sel_show(struct device *dev, val =3D drvdata->config.xtrig_rchan_sel; raw_spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%ld\n", val); + return sysfs_emit(buf, "%ld\n", val); } static DEVICE_ATTR_RW(chan_xtrigs_sel); =20 @@ -801,10 +801,10 @@ static ssize_t chan_xtrigs_in_show(struct device *dev, =20 for (reg_idx =3D 0; reg_idx < nr_trig_max; reg_idx++) { if (chan_mask & cfg->ctiinen[reg_idx]) - used +=3D sprintf(buf + used, "%d ", reg_idx); + used +=3D sysfs_emit_at(buf, used, "%d ", reg_idx); } =20 - used +=3D sprintf(buf + used, "\n"); + used +=3D sysfs_emit_at(buf, used, "\n"); return used; } static DEVICE_ATTR_RO(chan_xtrigs_in); @@ -821,10 +821,10 @@ static ssize_t chan_xtrigs_out_show(struct device *de= v, =20 for (reg_idx =3D 0; reg_idx < nr_trig_max; reg_idx++) { if (chan_mask & cfg->ctiouten[reg_idx]) - used +=3D sprintf(buf + used, "%d ", reg_idx); + used +=3D sysfs_emit_at(buf, used, "%d ", reg_idx); } =20 - used +=3D sprintf(buf + used, "\n"); + used +=3D sysfs_emit_at(buf, used, "\n"); return used; } static DEVICE_ATTR_RO(chan_xtrigs_out); @@ -914,7 +914,7 @@ static ssize_t con_name_show(struct device *dev, container_of(attr, struct dev_ext_attribute, attr); struct cti_trig_con *con =3D (struct cti_trig_con *)ext_attr->var; =20 - return sprintf(buf, "%s\n", con->con_dev_name); + return sysfs_emit(buf, "%s\n", con->con_dev_name); } =20 static ssize_t trigin_sig_show(struct device *dev, @@ -969,9 +969,9 @@ static ssize_t trigin_type_show(struct device *dev, =20 for (sig_idx =3D 0; sig_idx < con->con_in->nr_sigs; sig_idx++) { name =3D cti_sig_type_name(con, sig_idx, true); - used +=3D sprintf(buf + used, "%s ", name); + used +=3D sysfs_emit_at(buf, used, "%s ", name); } - used +=3D sprintf(buf + used, "\n"); + used +=3D sysfs_emit_at(buf, used, "\n"); return used; } =20 @@ -987,9 +987,9 @@ static ssize_t trigout_type_show(struct device *dev, =20 for (sig_idx =3D 0; sig_idx < con->con_out->nr_sigs; sig_idx++) { name =3D cti_sig_type_name(con, sig_idx, false); - used +=3D sprintf(buf + used, "%s ", name); + used +=3D sysfs_emit_at(buf, used, "%s ", name); } - used +=3D sprintf(buf + used, "\n"); + used +=3D sysfs_emit_at(buf, used, "\n"); return used; } =20 diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtrac= ing/coresight/coresight-etb10.c index d5efb085b30d..dd1c37c0bd72 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -672,7 +672,7 @@ static ssize_t trigger_cntr_show(struct device *dev, struct etb_drvdata *drvdata =3D dev_get_drvdata(dev->parent); unsigned long val =3D drvdata->trigger_cntr; =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t trigger_cntr_store(struct device *dev, diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwt= racing/coresight/coresight-etm-perf.c index f677c08233ba..fe1d3bfde370 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -85,7 +85,7 @@ static ssize_t format_attr_contextid_show(struct device *= dev, #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X) pid_fmt =3D is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID; #endif - return sprintf(page, "config:%d\n", pid_fmt); + return sysfs_emit(page, "config:%d\n", pid_fmt); } =20 static struct device_attribute format_attr_contextid =3D @@ -851,7 +851,7 @@ static ssize_t etm_perf_sink_name_show(struct device *d= ev, struct dev_ext_attribute *ea; =20 ea =3D container_of(dattr, struct dev_ext_attribute, attr); - return scnprintf(buf, PAGE_SIZE, "0x%px\n", ea->var); + return sysfs_emit(buf, "0x%px\n", ea->var); } =20 static struct dev_ext_attribute * @@ -943,7 +943,7 @@ static ssize_t etm_perf_cscfg_event_show(struct device = *dev, struct dev_ext_attribute *ea; =20 ea =3D container_of(dattr, struct dev_ext_attribute, attr); - return scnprintf(buf, PAGE_SIZE, "configid=3D0x%px\n", ea->var); + return sysfs_emit(buf, "configid=3D0x%px\n", ea->var); } =20 int etm_perf_add_symlink_cscfg(struct device *dev, struct cscfg_config_des= c *config_desc) diff --git a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c b/drivers/= hwtracing/coresight/coresight-etm3x-sysfs.c index 762109307b86..2dd80dd0c1bf 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c @@ -17,7 +17,7 @@ static ssize_t nr_addr_cmp_show(struct device *dev, struct etm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_addr_cmp; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_addr_cmp); =20 @@ -27,7 +27,7 @@ static ssize_t nr_cntr_show(struct device *dev, struct etm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_cntr; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_cntr); =20 @@ -38,7 +38,7 @@ static ssize_t nr_ctxid_cmp_show(struct device *dev, struct etm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_ctxid_cmp; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_ctxid_cmp); =20 @@ -58,7 +58,7 @@ static ssize_t etmsr_show(struct device *dev, spin_unlock_irqrestore(&drvdata->spinlock, flags); pm_runtime_put(dev->parent); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(etmsr); =20 @@ -101,7 +101,7 @@ static ssize_t mode_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->mode; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t mode_store(struct device *dev, @@ -186,7 +186,7 @@ static ssize_t trigger_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->trigger_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t trigger_event_store(struct device *dev, @@ -216,7 +216,7 @@ static ssize_t enable_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->enable_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t enable_event_store(struct device *dev, @@ -246,7 +246,7 @@ static ssize_t fifofull_level_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->fifofull_level; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t fifofull_level_store(struct device *dev, @@ -276,7 +276,7 @@ static ssize_t addr_idx_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->addr_idx; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_idx_store(struct device *dev, @@ -326,7 +326,7 @@ static ssize_t addr_single_show(struct device *dev, val =3D config->addr_val[idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_single_store(struct device *dev, @@ -385,7 +385,7 @@ static ssize_t addr_range_show(struct device *dev, val2 =3D config->addr_val[idx + 1]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx %#lx\n", val1, val2); + return sysfs_emit(buf, "%#lx %#lx\n", val1, val2); } =20 static ssize_t addr_range_store(struct device *dev, @@ -447,7 +447,7 @@ static ssize_t addr_start_show(struct device *dev, val =3D config->addr_val[idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_start_store(struct device *dev, @@ -501,7 +501,7 @@ static ssize_t addr_stop_show(struct device *dev, val =3D config->addr_val[idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_stop_store(struct device *dev, @@ -547,7 +547,7 @@ static ssize_t addr_acctype_show(struct device *dev, val =3D config->addr_acctype[config->addr_idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_acctype_store(struct device *dev, @@ -579,7 +579,7 @@ static ssize_t cntr_idx_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->cntr_idx; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_idx_store(struct device *dev, @@ -620,7 +620,7 @@ static ssize_t cntr_rld_val_show(struct device *dev, val =3D config->cntr_rld_val[config->cntr_idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_rld_val_store(struct device *dev, @@ -655,7 +655,7 @@ static ssize_t cntr_event_show(struct device *dev, val =3D config->cntr_event[config->cntr_idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_event_store(struct device *dev, @@ -690,7 +690,7 @@ static ssize_t cntr_rld_event_show(struct device *dev, val =3D config->cntr_rld_event[config->cntr_idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_rld_event_store(struct device *dev, @@ -725,7 +725,7 @@ static ssize_t cntr_val_show(struct device *dev, if (!coresight_get_mode(drvdata->csdev)) { spin_lock(&drvdata->spinlock); for (i =3D 0; i < drvdata->nr_cntr; i++) - ret +=3D sprintf(buf, "counter %d: %x\n", + ret +=3D sysfs_emit_at(buf, ret, "counter %d: %x\n", i, config->cntr_val[i]); spin_unlock(&drvdata->spinlock); return ret; @@ -733,7 +733,7 @@ static ssize_t cntr_val_show(struct device *dev, =20 for (i =3D 0; i < drvdata->nr_cntr; i++) { val =3D etm_readl(drvdata, ETMCNTVRn(i)); - ret +=3D sprintf(buf, "counter %d: %x\n", i, val); + ret +=3D sysfs_emit_at(buf, ret, "counter %d: %x\n", i, val); } =20 return ret; @@ -768,7 +768,7 @@ static ssize_t seq_12_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->seq_12_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_12_event_store(struct device *dev, @@ -797,7 +797,7 @@ static ssize_t seq_21_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->seq_21_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_21_event_store(struct device *dev, @@ -826,7 +826,7 @@ static ssize_t seq_23_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->seq_23_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_23_event_store(struct device *dev, @@ -855,7 +855,7 @@ static ssize_t seq_31_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->seq_31_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_31_event_store(struct device *dev, @@ -884,7 +884,7 @@ static ssize_t seq_32_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->seq_32_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_32_event_store(struct device *dev, @@ -913,7 +913,7 @@ static ssize_t seq_13_event_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->seq_13_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_13_event_store(struct device *dev, @@ -956,7 +956,7 @@ static ssize_t seq_curr_state_show(struct device *dev, spin_unlock_irqrestore(&drvdata->spinlock, flags); pm_runtime_put(dev->parent); out: - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_curr_state_store(struct device *dev, @@ -989,7 +989,7 @@ static ssize_t ctxid_idx_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->ctxid_idx; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t ctxid_idx_store(struct device *dev, @@ -1038,7 +1038,7 @@ static ssize_t ctxid_pid_show(struct device *dev, val =3D config->ctxid_pid[config->ctxid_idx]; spin_unlock(&drvdata->spinlock); =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t ctxid_pid_store(struct device *dev, @@ -1089,7 +1089,7 @@ static ssize_t ctxid_mask_show(struct device *dev, return -EINVAL; =20 val =3D config->ctxid_mask; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t ctxid_mask_store(struct device *dev, @@ -1125,7 +1125,7 @@ static ssize_t sync_freq_show(struct device *dev, struct etm_config *config =3D &drvdata->config; =20 val =3D config->sync_freq; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t sync_freq_store(struct device *dev, @@ -1154,7 +1154,7 @@ static ssize_t timestamp_event_show(struct device *de= v, struct etm_config *config =3D &drvdata->config; =20 val =3D config->timestamp_event; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t timestamp_event_store(struct device *dev, @@ -1182,7 +1182,7 @@ static ssize_t cpu_show(struct device *dev, struct etm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->cpu; - return scnprintf(buf, PAGE_SIZE, "%d\n", val); + return sysfs_emit(buf, "%d\n", val); =20 } static DEVICE_ATTR_RO(cpu); diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/= hwtracing/coresight/coresight-etm4x-sysfs.c index e9eeea6240d5..2244e5818d85 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c @@ -64,7 +64,7 @@ static ssize_t nr_pe_cmp_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_pe_cmp; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_pe_cmp); =20 @@ -76,7 +76,7 @@ static ssize_t nr_addr_cmp_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_addr_cmp; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_addr_cmp); =20 @@ -88,7 +88,7 @@ static ssize_t nr_cntr_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_cntr; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_cntr); =20 @@ -100,7 +100,7 @@ static ssize_t nr_ext_inp_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_ext_inp; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_ext_inp); =20 @@ -112,7 +112,7 @@ static ssize_t numcidc_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->numcidc; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(numcidc); =20 @@ -124,7 +124,7 @@ static ssize_t numvmidc_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->numvmidc; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(numvmidc); =20 @@ -136,7 +136,7 @@ static ssize_t nrseqstate_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nrseqstate; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nrseqstate); =20 @@ -148,7 +148,7 @@ static ssize_t nr_resource_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_resource; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_resource); =20 @@ -160,7 +160,7 @@ static ssize_t nr_ss_cmp_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->nr_ss_cmp; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(nr_ss_cmp); =20 @@ -288,7 +288,7 @@ static ssize_t mode_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->mode; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t mode_store(struct device *dev, @@ -454,7 +454,7 @@ static ssize_t pe_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->pe_sel; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t pe_store(struct device *dev, @@ -489,7 +489,7 @@ static ssize_t event_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->eventctrl0; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t event_store(struct device *dev, @@ -538,7 +538,7 @@ static ssize_t event_instren_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D FIELD_GET(TRCEVENTCTL1R_INSTEN_MASK, config->eventctrl1); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t event_instren_store(struct device *dev, @@ -594,7 +594,7 @@ static ssize_t event_ts_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->ts_ctrl; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t event_ts_store(struct device *dev, @@ -624,7 +624,7 @@ static ssize_t syncfreq_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->syncfreq; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t syncfreq_store(struct device *dev, @@ -654,7 +654,7 @@ static ssize_t cyc_threshold_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->ccctlr; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cyc_threshold_store(struct device *dev, @@ -687,7 +687,7 @@ static ssize_t bb_ctrl_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->bb_ctrl; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t bb_ctrl_store(struct device *dev, @@ -727,7 +727,7 @@ static ssize_t event_vinst_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D FIELD_GET(TRCVICTLR_EVENT_MASK, config->vinst_ctrl); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t event_vinst_store(struct device *dev, @@ -759,7 +759,7 @@ static ssize_t s_exlevel_vinst_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D FIELD_GET(TRCVICTLR_EXLEVEL_S_MASK, config->vinst_ctrl); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t s_exlevel_vinst_store(struct device *dev, @@ -794,7 +794,7 @@ static ssize_t ns_exlevel_vinst_show(struct device *dev, =20 /* EXLEVEL_NS, bits[23:20] */ val =3D FIELD_GET(TRCVICTLR_EXLEVEL_NS_MASK, config->vinst_ctrl); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t ns_exlevel_vinst_store(struct device *dev, @@ -828,7 +828,7 @@ static ssize_t addr_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->addr_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_idx_store(struct device *dev, @@ -867,8 +867,7 @@ static ssize_t addr_instdatatype_show(struct device *de= v, raw_spin_lock(&drvdata->spinlock); idx =3D config->addr_idx; val =3D FIELD_GET(TRCACATRn_TYPE_MASK, config->addr_acc[idx]); - len =3D scnprintf(buf, PAGE_SIZE, "%s\n", - val =3D=3D TRCACATRn_TYPE_ADDR ? "instr" : + len =3D sysfs_emit(buf, "%s\n", val =3D=3D TRCACATRn_TYPE_ADDR ? "instr" : (val =3D=3D TRCACATRn_TYPE_DATA_LOAD_ADDR ? "data_load" : (val =3D=3D TRCACATRn_TYPE_DATA_STORE_ADDR ? "data_store" : "data_load_store"))); @@ -919,7 +918,7 @@ static ssize_t addr_single_show(struct device *dev, } val =3D (unsigned long)config->addr_val[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_single_store(struct device *dev, @@ -975,7 +974,7 @@ static ssize_t addr_range_show(struct device *dev, val1 =3D (unsigned long)config->addr_val[idx]; val2 =3D (unsigned long)config->addr_val[idx + 1]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx %#lx\n", val1, val2); + return sysfs_emit(buf, "%#lx %#lx\n", val1, val2); } =20 static ssize_t addr_range_store(struct device *dev, @@ -1050,7 +1049,7 @@ static ssize_t addr_start_show(struct device *dev, =20 val =3D (unsigned long)config->addr_val[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_start_store(struct device *dev, @@ -1105,7 +1104,7 @@ static ssize_t addr_stop_show(struct device *dev, =20 val =3D (unsigned long)config->addr_val[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_stop_store(struct device *dev, @@ -1153,7 +1152,7 @@ static ssize_t addr_ctxtype_show(struct device *dev, idx =3D config->addr_idx; /* CONTEXTTYPE, bits[3:2] */ val =3D FIELD_GET(TRCACATRn_CONTEXTTYPE_MASK, config->addr_acc[idx]); - len =3D scnprintf(buf, PAGE_SIZE, "%s\n", val =3D=3D ETM_CTX_NONE ? "none= " : + len =3D sysfs_emit(buf, "%s\n", val =3D=3D ETM_CTX_NONE ? "none" : (val =3D=3D ETM_CTX_CTXID ? "ctxid" : (val =3D=3D ETM_CTX_VMID ? "vmid" : "all"))); raw_spin_unlock(&drvdata->spinlock); @@ -1220,7 +1219,7 @@ static ssize_t addr_context_show(struct device *dev, /* context ID comparator bits[6:4] */ val =3D FIELD_GET(TRCACATRn_CONTEXT_MASK, config->addr_acc[idx]); raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_context_store(struct device *dev, @@ -1263,7 +1262,7 @@ static ssize_t addr_exlevel_s_ns_show(struct device *= dev, idx =3D config->addr_idx; val =3D FIELD_GET(TRCACATRn_EXLEVEL_MASK, config->addr_acc[idx]); raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t addr_exlevel_s_ns_store(struct device *dev, @@ -1326,17 +1325,15 @@ static ssize_t addr_cmp_view_show(struct device *de= v, } raw_spin_unlock(&drvdata->spinlock); if (addr_type) { - size =3D scnprintf(buf, PAGE_SIZE, "addr_cmp[%i] %s %#lx", idx, - addr_type_names[addr_type], addr_v); + size =3D sysfs_emit(buf, "addr_cmp[%i] %s %#lx", idx, + addr_type_names[addr_type], addr_v); if (addr_type =3D=3D ETM_ADDR_TYPE_RANGE) { - size +=3D scnprintf(buf + size, PAGE_SIZE - size, - " %#lx %s", addr_v2, + size +=3D sysfs_emit_at(buf, size, " %#lx %s", addr_v2, exclude ? "exclude" : "include"); } - size +=3D scnprintf(buf + size, PAGE_SIZE - size, - " ctrl(%#lx)\n", addr_ctrl); + size +=3D sysfs_emit_at(buf, size, " ctrl(%#lx)\n", addr_ctrl); } else { - size =3D scnprintf(buf, PAGE_SIZE, "addr_cmp[%i] unused\n", idx); + size =3D sysfs_emit(buf, "addr_cmp[%i] unused\n", idx); } return size; } @@ -1353,7 +1350,7 @@ static ssize_t vinst_pe_cmp_start_stop_show(struct de= vice *dev, if (!drvdata->nr_pe_cmp) return -EINVAL; val =3D config->vipcssctlr; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static ssize_t vinst_pe_cmp_start_stop_store(struct device *dev, struct device_attribute *attr, @@ -1384,7 +1381,7 @@ static ssize_t seq_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->seq_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_idx_store(struct device *dev, @@ -1420,7 +1417,7 @@ static ssize_t seq_state_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->seq_state; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_state_store(struct device *dev, @@ -1454,7 +1451,7 @@ static ssize_t seq_event_show(struct device *dev, idx =3D config->seq_idx; val =3D config->seq_ctrl[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_event_store(struct device *dev, @@ -1487,7 +1484,7 @@ static ssize_t seq_reset_event_show(struct device *de= v, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->seq_rst; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t seq_reset_event_store(struct device *dev, @@ -1517,7 +1514,7 @@ static ssize_t cntr_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->cntr_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_idx_store(struct device *dev, @@ -1557,7 +1554,7 @@ static ssize_t cntrldvr_show(struct device *dev, idx =3D config->cntr_idx; val =3D config->cntrldvr[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntrldvr_store(struct device *dev, @@ -1595,7 +1592,7 @@ static ssize_t cntr_val_show(struct device *dev, idx =3D config->cntr_idx; val =3D config->cntr_val[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_val_store(struct device *dev, @@ -1633,7 +1630,7 @@ static ssize_t cntr_ctrl_show(struct device *dev, idx =3D config->cntr_idx; val =3D config->cntr_ctrl[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t cntr_ctrl_store(struct device *dev, @@ -1665,7 +1662,7 @@ static ssize_t res_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->res_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t res_idx_store(struct device *dev, @@ -1709,7 +1706,7 @@ static ssize_t res_ctrl_show(struct device *dev, idx =3D config->res_idx; val =3D config->res_ctrl[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t res_ctrl_store(struct device *dev, @@ -1747,7 +1744,7 @@ static ssize_t sshot_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->ss_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t sshot_idx_store(struct device *dev, @@ -1781,7 +1778,7 @@ static ssize_t sshot_ctrl_show(struct device *dev, raw_spin_lock(&drvdata->spinlock); val =3D config->ss_ctrl[config->ss_idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t sshot_ctrl_store(struct device *dev, @@ -1816,7 +1813,7 @@ static ssize_t sshot_status_show(struct device *dev, raw_spin_lock(&drvdata->spinlock); val =3D config->ss_status[config->ss_idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(sshot_status); =20 @@ -1831,7 +1828,7 @@ static ssize_t sshot_pe_ctrl_show(struct device *dev, raw_spin_lock(&drvdata->spinlock); val =3D config->ss_pe_cmp[config->ss_idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t sshot_pe_ctrl_store(struct device *dev, @@ -1865,7 +1862,7 @@ static ssize_t ctxid_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->ctxid_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t ctxid_idx_store(struct device *dev, @@ -1912,7 +1909,7 @@ static ssize_t ctxid_pid_show(struct device *dev, idx =3D config->ctxid_idx; val =3D (unsigned long)config->ctxid_pid[idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t ctxid_pid_store(struct device *dev, @@ -1973,7 +1970,7 @@ static ssize_t ctxid_masks_show(struct device *dev, val1 =3D config->ctxid_mask0; val2 =3D config->ctxid_mask1; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx %#lx\n", val1, val2); + return sysfs_emit(buf, "%#lx %#lx\n", val1, val2); } =20 static ssize_t ctxid_masks_store(struct device *dev, @@ -2091,7 +2088,7 @@ static ssize_t vmid_idx_show(struct device *dev, struct etmv4_config *config =3D &drvdata->config; =20 val =3D config->vmid_idx; - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t vmid_idx_store(struct device *dev, @@ -2136,7 +2133,7 @@ static ssize_t vmid_val_show(struct device *dev, raw_spin_lock(&drvdata->spinlock); val =3D (unsigned long)config->vmid_val[config->vmid_idx]; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t vmid_val_store(struct device *dev, @@ -2188,7 +2185,7 @@ static ssize_t vmid_masks_show(struct device *dev, val1 =3D config->vmid_mask0; val2 =3D config->vmid_mask1; raw_spin_unlock(&drvdata->spinlock); - return scnprintf(buf, PAGE_SIZE, "%#lx %#lx\n", val1, val2); + return sysfs_emit(buf, "%#lx %#lx\n", val1, val2); } =20 static ssize_t vmid_masks_store(struct device *dev, @@ -2304,7 +2301,7 @@ static ssize_t cpu_show(struct device *dev, struct etmv4_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->cpu; - return scnprintf(buf, PAGE_SIZE, "%d\n", val); + return sysfs_emit(buf, "%d\n", val); =20 } static DEVICE_ATTR_RO(cpu); @@ -2462,7 +2459,7 @@ static ssize_t coresight_etm4x_reg_show(struct device= *dev, val =3D etmv4_cross_read(drvdata, offset); pm_runtime_put_sync(dev->parent); =20 - return scnprintf(buf, PAGE_SIZE, "0x%x\n", val); + return sysfs_emit(buf, "0x%x\n", val); } =20 static bool diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtra= cing/coresight/coresight-funnel.c index b1922dbe9292..2b6009bb7a3b 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -157,7 +157,7 @@ static ssize_t priority_show(struct device *dev, struct funnel_drvdata *drvdata =3D dev_get_drvdata(dev->parent); unsigned long val =3D drvdata->priority; =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t priority_store(struct device *dev, @@ -200,7 +200,7 @@ static ssize_t funnel_ctrl_show(struct device *dev, =20 pm_runtime_put(dev->parent); =20 - return sprintf(buf, "%#x\n", val); + return sysfs_emit(buf, "%#x\n", val); } static DEVICE_ATTR_RO(funnel_ctrl); =20 diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracin= g/coresight/coresight-stm.c index 464b0c85c3f7..ba5f8e69ffdc 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -470,7 +470,7 @@ static ssize_t hwevent_enable_show(struct device *dev, struct stm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); unsigned long val =3D drvdata->stmheer; =20 - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t hwevent_enable_store(struct device *dev, @@ -499,7 +499,7 @@ static ssize_t hwevent_select_show(struct device *dev, struct stm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); unsigned long val =3D drvdata->stmhebsr; =20 - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t hwevent_select_store(struct device *dev, @@ -534,7 +534,7 @@ static ssize_t port_select_show(struct device *dev, spin_unlock(&drvdata->spinlock); } =20 - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t port_select_store(struct device *dev, @@ -581,7 +581,7 @@ static ssize_t port_enable_show(struct device *dev, spin_unlock(&drvdata->spinlock); } =20 - return scnprintf(buf, PAGE_SIZE, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t port_enable_store(struct device *dev, @@ -617,7 +617,7 @@ static ssize_t traceid_show(struct device *dev, struct stm_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->traceid; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(traceid); =20 diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtrac= ing/coresight/coresight-sysfs.c index feadaf065b53..8c7bfaae0cbd 100644 --- a/drivers/hwtracing/coresight/coresight-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-sysfs.c @@ -315,7 +315,7 @@ static ssize_t enable_sink_show(struct device *dev, { struct coresight_device *csdev =3D to_coresight_device(dev); =20 - return scnprintf(buf, PAGE_SIZE, "%u\n", csdev->sysfs_sink_activated); + return sysfs_emit(buf, "%u\n", csdev->sysfs_sink_activated); } =20 static ssize_t enable_sink_store(struct device *dev, @@ -343,7 +343,7 @@ static ssize_t enable_source_show(struct device *dev, struct coresight_device *csdev =3D to_coresight_device(dev); =20 guard(mutex)(&coresight_mutex); - return scnprintf(buf, PAGE_SIZE, "%u\n", + return sysfs_emit(buf, "%u\n", coresight_get_mode(csdev) =3D=3D CS_MODE_SYSFS); } =20 @@ -416,7 +416,7 @@ static ssize_t nr_links_show(struct device *dev, { struct coresight_device *csdev =3D to_coresight_device(dev); =20 - return sprintf(buf, "%d\n", csdev->nr_links); + return sysfs_emit(buf, "%d\n", csdev->nr_links); } static DEVICE_ATTR_RO(nr_links); =20 diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwt= racing/coresight/coresight-tmc-core.c index be964656be93..42316bd19056 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -481,7 +481,7 @@ static ssize_t trigger_cntr_show(struct device *dev, struct tmc_drvdata *drvdata =3D dev_get_drvdata(dev->parent); unsigned long val =3D drvdata->trigger_cntr; =20 - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } =20 static ssize_t trigger_cntr_store(struct device *dev, @@ -506,7 +506,7 @@ static ssize_t buffer_size_show(struct device *dev, { struct tmc_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 - return sprintf(buf, "%#x\n", drvdata->size); + return sysfs_emit(buf, "%#x\n", drvdata->size); } =20 static ssize_t buffer_size_store(struct device *dev, @@ -538,7 +538,7 @@ static ssize_t stop_on_flush_show(struct device *dev, { struct tmc_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 - return sprintf(buf, "%#x\n", drvdata->stop_on_flush); + return sysfs_emit(buf, "%#x\n", drvdata->stop_on_flush); } =20 static ssize_t stop_on_flush_store(struct device *dev, diff --git a/drivers/hwtracing/coresight/coresight-tnoc.c b/drivers/hwtraci= ng/coresight/coresight-tnoc.c index d542df46ea39..67fd5f60b86c 100644 --- a/drivers/hwtracing/coresight/coresight-tnoc.c +++ b/drivers/hwtracing/coresight/coresight-tnoc.c @@ -140,7 +140,7 @@ static ssize_t traceid_show(struct device *dev, struct trace_noc_drvdata *drvdata =3D dev_get_drvdata(dev->parent); =20 val =3D drvdata->atid; - return sprintf(buf, "%#lx\n", val); + return sysfs_emit(buf, "%#lx\n", val); } static DEVICE_ATTR_RO(traceid); =20 diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtraci= ng/coresight/coresight-trbe.c index 10f3fb401edf..9f3041d537bb 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.c +++ b/drivers/hwtracing/coresight/coresight-trbe.c @@ -1204,7 +1204,7 @@ static ssize_t align_show(struct device *dev, struct = device_attribute *attr, cha { struct trbe_cpudata *cpudata =3D dev_get_drvdata(dev); =20 - return sprintf(buf, "%llx\n", cpudata->trbe_hw_align); + return sysfs_emit(buf, "%llx\n", cpudata->trbe_hw_align); } static DEVICE_ATTR_RO(align); =20 @@ -1212,7 +1212,7 @@ static ssize_t flag_show(struct device *dev, struct d= evice_attribute *attr, char { struct trbe_cpudata *cpudata =3D dev_get_drvdata(dev); =20 - return sprintf(buf, "%d\n", cpudata->trbe_flag); + return sysfs_emit(buf, "%d\n", cpudata->trbe_flag); } static DEVICE_ATTR_RO(flag); =20 --=20 2.47.3