From nobody Thu Oct 9 06:34:05 2025 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (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 5330421E098 for ; Thu, 19 Jun 2025 16:23:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750350214; cv=none; b=I7fPrwNHO68QSJ5l/0hDQPyRmAN7yhyBcMkIS0r2K0daU9bno3cxW7yVK68gvgqdg3k+wZ8ec+EUoRLOaqfUiKN2iUiYNGlHBn0N9UkBxkPl39RzFJKnuoICGgVDeBw6oopEeGaVd3Yxzpcr7o2WGD6hWg8ssOISeOdWsD+qI3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750350214; c=relaxed/simple; bh=tmT4Gn2/nkecLlHBF5uVCHfn78uXNSkLUXWEVOnVyVE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HorCgihG7mXSFuZjNlw+9KpmcIvtaad0umxk3ps0InOiaCFwX8VY6nO39f+W9ZEinX/9JQqp8NegLfJgQbeCBL2qbbDTF9Vynfv9+KJ1yrzHCOIUIlqugYtMWO2n0cc3iDm4NTwYBkyC2Dgj5lZFHtz2Ojd5toqOG/w1lniptyE= 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=WunvjWML; arc=none smtp.client-ip=209.85.160.180 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="WunvjWML" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4a43d2d5569so11918971cf.0 for ; Thu, 19 Jun 2025 09:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750350211; x=1750955011; 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=Rz/2lFglaiFjcHkQ88BdWlEMXCEc6DVYDxdRF6fBgt8=; b=WunvjWMLvwWUPk/gUctZ7C7rrQQm9hLesXpSn4iweCgN/25Xufeg9xGDSph41yXuMZ pA96NY2yRCt/qTcUCw7noyKlyw3s4YLCqNXSrsPl76flTLQRtzakF4aIn6DOIcPM55Xs qPc1Ydp9Oui+oIwJVkPq8My6ESQDDZa5hu9cMPKi+h5ZUo0TYG1+ygQq3LTWR/NcNFjf teCRWd/hKhTYBbd0Rw1P8OELj9Jl3tUv9spTpXcQkrYGfcR+aKjOm5uO2Go4B3PZT0Y1 PrUSZw30TYA1HSlEYS742tq6KtAX2XbJh+5cJfRIT2BE2UQLDPd6Wz3hpbvEL1sjxbMf MaGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750350211; x=1750955011; 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=Rz/2lFglaiFjcHkQ88BdWlEMXCEc6DVYDxdRF6fBgt8=; b=MJviMoo1WRG4V2GWMBr0E5pesRkHYOyF9QD0GKPzqG4DEeWI93XxR7Kt86N5P0kYWk 350tlYOXKmZ9bmLKbzd7FGpI/s95QRebuy6tqJSqlsOWNxmYyMmZXb42Qj9bMUb8xG3t iKEqRfP/EUyzt4mpTAzOcxE5WoOIW1HwvC5wNorpHykanzAXcwE5o6bTn+UjqLggswJl Tuw/Dcaj7EmZqXE7g7l8wYdFMRVvAbznaH3fxJOom56lfBjlhxoKwyLjY+2s2asNhcaA ilUgklch67K4FEOcRRj6Vp3nWxg+hQ6gyl9+6tj8JvVXZRJYhAelm0/XmBO8ZBciQPzT eApg== X-Forwarded-Encrypted: i=1; AJvYcCUNhQYtZqjZ/T4r9CNLKIjNr+Bimewk04vadX42ZZzo9jRwHz/TljqAMWliZXS93/FQ7w6AKobTJRFgNyg=@vger.kernel.org X-Gm-Message-State: AOJu0YxFc+WXl6acyUDoTzeNC6E5WT2H9IYHi5wa6Ulb2vHdC+qqBI2G Xac8W/FyNSByIVZ3iHuvn8bVpXhE2HjY6j9DpcSlQQlRLRhKW/JjUVIN X-Gm-Gg: ASbGncsVmvlBkKa4l+pM9mGs9ZqJjmWUPQ/52uVTA69zfSPFsSyNRrwmbiA0J+H/p8V p4mOmsobH09ligVOVkAHd3zvzWg+bwYRQDygekbrLMKLePpVNgq8PHx3CR4nv2xCACXl745QfQ8 KjQdQ11t3gWSbLFUh2tS55u2zPCvUn0hQPUHWhY5YhOY0oaHfFJol56snvvk8L7b/YHX+LnhwiR 3KwazzxNiti0JkF8AllKB3fwQJkBsK23pMHVwbBHcVLtSmG3/WRsaYFKN9eo+htNdAZmvof74Eb 8mncAeFzdhcdVXUoO7Drt7x/f2veRRF0ELDLwY6X50jhlEXR4gHwee7UTqQVpe4XRIP70suedY5 N0BZT7aFGvu1wrKaqvHGs+/h1VDwJaJAJwyPUo7I= X-Google-Smtp-Source: AGHT+IE+s9KWpKIu8Jo2f0MqItPZ8FyakWm9PfdyTrcqtUoxBQrKS6ELgr1/Zsnp3kXGNQFb0YD0kQ== X-Received: by 2002:a05:622a:5d0d:b0:4a5:a5df:d1f9 with SMTP id d75a77b69052e-4a74dbf14ecmr233374031cf.43.1750350211007; Thu, 19 Jun 2025 09:23:31 -0700 (PDT) Received: from fyre-x-redhat96-client-2.fyre.ibm.com ([129.41.87.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a7784ae174sm1118241cf.4.2025.06.19.09.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 09:23:30 -0700 (PDT) From: Chelsy Ratnawat To: suzuki.poulose@arm.com, alexander.shishkin@linux.intel.com, mike.leach@linaro.org Cc: james.clark@linaro.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Chelsy Ratnawat Subject: [PATCH v2] coresight: Replace scnprintf() with sysfs_emit() in sysfs show functions Date: Thu, 19 Jun 2025 09:23:18 -0700 Message-ID: <20250619162318.417676-1-chelsyratnawat2001@gmail.com> X-Mailer: git-send-email 2.47.1 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" Replace calls to scnprintf() with sysfs_emit() in sysfs show functions. These helpers are preferred in sysfs callbacks because they automatically handle buffer sizing (PAGE_SIZE) and improve safety and readability. Signed-off-by: Chelsy Ratnawat Reviewed-by: James Clark --- Changes in v2: - Included remaining conversions in coresight-sysfs.c .../hwtracing/coresight/coresight-etm-perf.c | 4 +- .../coresight/coresight-etm3x-sysfs.c | 2 +- .../coresight/coresight-etm4x-sysfs.c | 108 +++++++++--------- drivers/hwtracing/coresight/coresight-stm.c | 8 +- drivers/hwtracing/coresight/coresight-sysfs.c | 4 +- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwt= racing/coresight/coresight-etm-perf.c index f1551c08ecb2..8cfdcbc2f8f6 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -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%lx\n", (unsigned long)(ea->var)); + return sysfs_emit(buf, "0x%lx\n", (unsigned long)(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%lx\n", (unsigned long)(ea= ->var)); + return sysfs_emit(buf, "configid=3D0x%lx\n", (unsigned long)(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..4868eb05a312 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm3x-sysfs.c @@ -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 ab251865b893..7cf4045cc748 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c @@ -63,7 +63,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 @@ -75,7 +75,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 @@ -87,7 +87,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 @@ -99,7 +99,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 @@ -111,7 +111,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 @@ -123,7 +123,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 @@ -135,7 +135,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 @@ -147,7 +147,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 @@ -159,7 +159,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 @@ -287,7 +287,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, @@ -453,7 +453,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, @@ -488,7 +488,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, @@ -537,7 +537,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, @@ -593,7 +593,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, @@ -623,7 +623,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, @@ -653,7 +653,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, @@ -686,7 +686,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, @@ -726,7 +726,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, @@ -758,7 +758,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, @@ -793,7 +793,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, @@ -827,7 +827,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, @@ -866,7 +866,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", + 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" : @@ -918,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, @@ -974,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, @@ -1049,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, @@ -1104,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, @@ -1152,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); @@ -1219,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, @@ -1262,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, @@ -1325,7 +1325,7 @@ static ssize_t addr_cmp_view_show(struct device *dev, } raw_spin_unlock(&drvdata->spinlock); if (addr_type) { - size =3D scnprintf(buf, PAGE_SIZE, "addr_cmp[%i] %s %#lx", idx, + 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, @@ -1335,7 +1335,7 @@ static ssize_t addr_cmp_view_show(struct device *dev, size +=3D scnprintf(buf + size, PAGE_SIZE - 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; } @@ -1352,7 +1352,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, @@ -1383,7 +1383,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, @@ -1419,7 +1419,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, @@ -1453,7 +1453,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, @@ -1486,7 +1486,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, @@ -1516,7 +1516,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, @@ -1556,7 +1556,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, @@ -1594,7 +1594,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, @@ -1632,7 +1632,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, @@ -1664,7 +1664,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, @@ -1708,7 +1708,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, @@ -1746,7 +1746,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, @@ -1780,7 +1780,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, @@ -1815,7 +1815,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 @@ -1830,7 +1830,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, @@ -1864,7 +1864,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, @@ -1911,7 +1911,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, @@ -1972,7 +1972,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, @@ -2090,7 +2090,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, @@ -2135,7 +2135,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, @@ -2187,7 +2187,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, @@ -2303,7 +2303,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); @@ -2461,7 +2461,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-stm.c b/drivers/hwtracin= g/coresight/coresight-stm.c index e45c6c7204b4..fa09a43889d7 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, diff --git a/drivers/hwtracing/coresight/coresight-sysfs.c b/drivers/hwtrac= ing/coresight/coresight-sysfs.c index feadaf065b53..547f4970e1e5 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 --=20 2.47.1