From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (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 5E50F14B959 for ; Sun, 13 Apr 2025 07:32:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744529571; cv=none; b=puJ3VP0DLWvQFm4+xKTZ42xFiDQOn49dDYrvUxsIghEW95B29PHeSI588SgW37UIizV1uMG8Vp2Iqg822q6xSBvlWh+U4s+3wRrZcR+Qzj22EqHfhOErEsYZDX+2ziDqF52EfK7v8Vlo+HdkJIJj9vA8TtJvUtTZceJtnoQ5eng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744529571; c=relaxed/simple; bh=fehAY3yC24ro6+vZ6beyRqMUmWTlnkKTJtJoxqInxag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TZaM19huAKRvrAmItANiCNopcWTj95PhA5lDetOZYBDZcLY0s0YhNzLfaERuYNgs20t8t7DpnQH+Wgmqkp7VtuY118wwQfO4CNVZbSyNSDbMq1KfPZSv1UeWak9odBLCwrgiTyQp2EtNbOaZIuc42BkK3ngl8BxzK9QtJmIring= 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=ePYxcsgz; arc=none smtp.client-ip=209.85.160.195 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="ePYxcsgz" Received: by mail-qt1-f195.google.com with SMTP id d75a77b69052e-47663aeff1bso31193781cf.0 for ; Sun, 13 Apr 2025 00:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744529568; x=1745134368; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cjFyocYzTktppiP9pnTPpA+jTKDR4/yXZeC89Tb5gFw=; b=ePYxcsgzq2dlIXtjbVdoknPws5wqbgcQS42og7XV6sWWWRaBq4llgi425PSMe5DUax xcN4qatUGpVTjcBm9GqEuXdLR22caulqckkTb6ggPaM+L3v5uNwcxFBP64c3J/HrAKos +yVS1gdOxPelJkQqYuzbjd6l3dDSVCvTkQznwiCIOMPMhqcGDjqpMIBSA63fiNRWChWO Z/Yo94RGY0TfN3uNY9qwZS4jm5MbctxctF7BJFYXNFgrdNDwdhoSc9L+DTqvUEK6AP7m 993E6YLHwlH3qEIEXTa0GrzsdrENd6EXi9PaihByOozGUzENTnvnfPU/eQS11vqhFohO NMIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744529568; x=1745134368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cjFyocYzTktppiP9pnTPpA+jTKDR4/yXZeC89Tb5gFw=; b=TA+H0KBL5lQG8jPidq4oND53jIGG5/khMOivMuVzewff77Jmp5H/U6yrpYic4lH3dl GAdZFZ+FvjB3mD6lh4RvdsoEszHZ9D0Wwb3LSn5/1SNx8ciMwcDf7B1w57Aka9Ej7dKy 3v/GfKr0eW28ojdXgRNpcbF2aF74FOA8+qMdhpJ/xtQyWpQyKxNQUGk6ePiRLzoDDUKX lZW7ScFiVfddb2p1bBEFfPkqw0zCLKjYNyNFj8z1BzplLFirO6BsnthRWkkYOGJzdxpf A2PjGVCKglTxDJFyFHzVPaHaJ4l5Nxq7Mpo6zomvZ/psRhCu7Nt8t4edavvyfphJyseB +MsQ== X-Forwarded-Encrypted: i=1; AJvYcCV+dGNObwLmomdWbrCcPfSjDs5vZO10qzrof/QgE4WA8Z9J8HHEU0qweIpSE6Fw2COgM/9iR77v1BYvrevT@lists.linux.dev X-Gm-Message-State: AOJu0Yy+3ofRpj+AsGxM1DVTNaoe/eEDI7Mr9O28FOTyHCKfC5Nx78za E98woxMUWIG8MKfYLVzlcmVC5xO5bJ3HGHmcaEb1csVUCbVfWWDI X-Gm-Gg: ASbGnct1NZxNe+Jh6iEVBKs2QQlZjrEq0gwdNXVm7M5qCB5QxeVhWblzFbxUvJEDTeb WGPcIj+lCz12VbSgfw8+9icauSogtCW9DBDylmkLkd5/Crmxbcr+UB4nKLkzhQxqLtUBnrFKm3z lA73RIOUKDVYa/MjUbFQEANYTV9Bh93czHDarWGldFBRnPXluIcTMdRPtEdtSLe5ygNUu6YuBCD 6UFGelQRvYcrMD8zJtpf1QdJFwHX4pvw20UC2UYajaWGipmGIKmoLffBBKKPxLzl94NVE37BpfS rtb2O1TuMfyeIYkUNQsVJzcadaefBsFXc8XteyCjPX5zy1XE6ljYY2muEbm0nCVaIpwpG+OeQ3D 56WX4vRYETFj9HRHTQQ== X-Google-Smtp-Source: AGHT+IGpMWIVWiaLD+lZUi3FoY3HlefhbjuHhYs+GY72x7GKKVsUGlazfJiv8se0ZguiIp9mskaJEg== X-Received: by 2002:a05:622a:592:b0:474:fab0:6564 with SMTP id d75a77b69052e-479775d5f9bmr121885351cf.37.1744529568160; Sun, 13 Apr 2025 00:32:48 -0700 (PDT) Received: from UbuntuDev.. (syn-074-067-077-020.res.spectrum.com. [74.67.77.20]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4796eb0b58csm52142401cf.2.2025.04.13.00.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Apr 2025 00:32:47 -0700 (PDT) From: Ganesh Kumar Pittala To: johan@kernel.org, elder@kernel.org, gregkh@linuxfoundation.org Cc: greybus-dev@lists.linaro.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, hvaibhav.linux@gmail.com, vaibhav.sr@gmail.com, mgreer@animalcreek.com, rmfrfs@gmail.com, pure.logic@nexus-software.ie, ganeshkpittala@gmail.com Subject: [PATCH v2 2/4] staging: greybus: replace sprintf with sysfs_emit in sysfs show functions Date: Sun, 13 Apr 2025 07:32:18 +0000 Message-ID: <20250413073220.15931-3-ganeshkpittala@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250413073220.15931-1-ganeshkpittala@gmail.com> References: <20250413073220.15931-1-ganeshkpittala@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This patch replaces deprecated uses of sprintf() with the safer sysfs_emit() helper in multiple sysfs show functions across the Greybus staging drivers. The sysfs_emit() API is designed specifically for sysfs usage and ensures proper formatting, length checks, and termination, aligning with current kernel best practices. Affected files: - audio_manager_module.c - loopback.c (sysfs-related only) - arche-platform.c - arche-apb-ctrl.c - light.c - gbphy.c Signed-off-by: Ganesh Kumar Pittala --- drivers/staging/greybus/arche-apb-ctrl.c | 11 ++++++----- drivers/staging/greybus/arche-platform.c | 11 ++++++----- drivers/staging/greybus/audio_manager_module.c | 13 +++++++------ drivers/staging/greybus/gbphy.c | 3 ++- drivers/staging/greybus/light.c | 5 +++-- drivers/staging/greybus/loopback.c | 15 ++++++++------- 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c index 90ab32638d3f..9862188e8367 100644 --- a/drivers/staging/greybus/arche-apb-ctrl.c +++ b/drivers/staging/greybus/arche-apb-ctrl.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "arche_platform.h" static void apb_bootret_deassert(struct device *dev); @@ -299,16 +300,16 @@ static ssize_t state_show(struct device *dev, switch (apb->state) { case ARCHE_PLATFORM_STATE_OFF: - return sprintf(buf, "off%s\n", + return sysfs_emit(buf, "off%s\n", apb->init_disabled ? ",disabled" : ""); case ARCHE_PLATFORM_STATE_ACTIVE: - return sprintf(buf, "active\n"); + return sysfs_emit(buf, "active\n"); case ARCHE_PLATFORM_STATE_STANDBY: - return sprintf(buf, "standby\n"); + return sysfs_emit(buf, "standby\n"); case ARCHE_PLATFORM_STATE_FW_FLASHING: - return sprintf(buf, "fw_flashing\n"); + return sysfs_emit(buf, "fw_flashing\n"); default: - return sprintf(buf, "unknown state\n"); + return sysfs_emit(buf, "unknown state\n"); } } diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c index d48464390f58..2e706c1169d5 100644 --- a/drivers/staging/greybus/arche-platform.c +++ b/drivers/staging/greybus/arche-platform.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "arche_platform.h" #if IS_ENABLED(CONFIG_USB_HSIC_USB3613) @@ -374,15 +375,15 @@ static ssize_t state_show(struct device *dev, switch (arche_pdata->state) { case ARCHE_PLATFORM_STATE_OFF: - return sprintf(buf, "off\n"); + return sysfs_emit(buf, "off\n"); case ARCHE_PLATFORM_STATE_ACTIVE: - return sprintf(buf, "active\n"); + return sysfs_emit(buf, "active\n"); case ARCHE_PLATFORM_STATE_STANDBY: - return sprintf(buf, "standby\n"); + return sysfs_emit(buf, "standby\n"); case ARCHE_PLATFORM_STATE_FW_FLASHING: - return sprintf(buf, "fw_flashing\n"); + return sysfs_emit(buf, "fw_flashing\n"); default: - return sprintf(buf, "unknown state\n"); + return sysfs_emit(buf, "unknown state\n"); } } diff --git a/drivers/staging/greybus/audio_manager_module.c b/drivers/staging/greybus/audio_manager_module.c index 4a4dfb42f50f..781144be4eec 100644 --- a/drivers/staging/greybus/audio_manager_module.c +++ b/drivers/staging/greybus/audio_manager_module.c @@ -6,6 +6,7 @@ */ #include +#include #include "audio_manager.h" #include "audio_manager_private.h" @@ -76,7 +77,7 @@ static void gb_audio_module_release(struct kobject *kobj) static ssize_t gb_audio_module_name_show(struct gb_audio_manager_module *module, struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%s", module->desc.name); + return sysfs_emit(buf, "%s\n", module->desc.name); } static struct gb_audio_manager_module_attribute gb_audio_module_name_attribute = @@ -85,7 +86,7 @@ static struct gb_audio_manager_module_attribute gb_audio_module_name_attribute = static ssize_t gb_audio_module_vid_show(struct gb_audio_manager_module *module, struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%d", module->desc.vid); + return sysfs_emit(buf, "%d\n", module->desc.vid); } static struct gb_audio_manager_module_attribute gb_audio_module_vid_attribute = @@ -94,7 +95,7 @@ static struct gb_audio_manager_module_attribute gb_audio_module_vid_attribute = static ssize_t gb_audio_module_pid_show(struct gb_audio_manager_module *module, struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%d", module->desc.pid); + return sysfs_emit(buf, "%d\n", module->desc.pid); } static struct gb_audio_manager_module_attribute gb_audio_module_pid_attribute = @@ -104,7 +105,7 @@ static ssize_t gb_audio_module_intf_id_show(struct gb_audio_manager_module *modu struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "%d", module->desc.intf_id); + return sysfs_emit(buf, "%d\n", module->desc.intf_id); } static struct gb_audio_manager_module_attribute @@ -115,7 +116,7 @@ static ssize_t gb_audio_module_ip_devices_show(struct gb_audio_manager_module *m struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "0x%X", module->desc.ip_devices); + return sysfs_emit(buf, "0x%X\n", module->desc.ip_devices); } static struct gb_audio_manager_module_attribute @@ -126,7 +127,7 @@ static ssize_t gb_audio_module_op_devices_show(struct gb_audio_manager_module *m struct gb_audio_manager_module_attribute *attr, char *buf) { - return sprintf(buf, "0x%X", module->desc.op_devices); + return sysfs_emit(buf, "0x%X\n", module->desc.op_devices); } static struct gb_audio_manager_module_attribute diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c index 6adcad286633..72d72aa7cb0f 100644 --- a/drivers/staging/greybus/gbphy.c +++ b/drivers/staging/greybus/gbphy.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "gbphy.h" @@ -31,7 +32,7 @@ static ssize_t protocol_id_show(struct device *dev, { struct gbphy_device *gbphy_dev = to_gbphy_dev(dev); - return sprintf(buf, "0x%02x\n", gbphy_dev->cport_desc->protocol_id); + return sysfs_emit(buf, "0x%02x\n", gbphy_dev->cport_desc->protocol_id); } static DEVICE_ATTR_RO(protocol_id); diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index e509fdc715db..db0e98faec08 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #define NAMES_MAX 32 @@ -173,7 +174,7 @@ static ssize_t fade_##__dir##_show(struct device *dev, \ struct led_classdev *cdev = dev_get_drvdata(dev); \ struct gb_channel *channel = get_channel_from_cdev(cdev); \ \ - return sprintf(buf, "%u\n", channel->fade_##__dir); \ + return sysfs_emit(buf, "%u\n", channel->fade_##__dir); \ } \ \ static ssize_t fade_##__dir##_store(struct device *dev, \ @@ -220,7 +221,7 @@ static ssize_t color_show(struct device *dev, struct device_attribute *attr, struct led_classdev *cdev = dev_get_drvdata(dev); struct gb_channel *channel = get_channel_from_cdev(cdev); - return sprintf(buf, "0x%08x\n", channel->color); + return sysfs_emit(buf, "0x%08x\n", channel->color); } static ssize_t color_store(struct device *dev, struct device_attribute *attr, diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 1f19323b0e1a..c194afea941a 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #define NSEC_PER_DAY 86400000000000ULL @@ -125,7 +126,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%u\n", gb->field); \ + return sysfs_emit(buf, "%u\n", gb->field); \ } \ static DEVICE_ATTR_RO(field) @@ -137,8 +138,8 @@ static ssize_t name##_##field##_show(struct device *dev, \ struct gb_loopback *gb = dev_get_drvdata(dev); \ /* Report 0 for min and max if no transfer succeeded */ \ if (!gb->requests_completed) \ - return sprintf(buf, "0\n"); \ - return sprintf(buf, "%" #type "\n", gb->name.field); \ + return sysfs_emit(buf, "0\n"); \ + return sysfs_emit(buf, "%" #type "\n", gb->name.field); \ } \ static DEVICE_ATTR_RO(name##_##field) @@ -158,7 +159,7 @@ static ssize_t name##_avg_show(struct device *dev, \ rem = do_div(avg, count); \ rem *= 1000000; \ do_div(rem, count); \ - return sprintf(buf, "%llu.%06u\n", avg, (u32)rem); \ + return sysfs_emit(buf, "%llu.%06u\n", avg, (u32)rem); \ } \ static DEVICE_ATTR_RO(name##_avg) @@ -173,7 +174,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%" #type "\n", gb->field); \ + return sysfs_emit(buf, "%" #type "\n", gb->field); \ } \ static ssize_t field##_store(struct device *dev, \ struct device_attribute *attr, \ @@ -199,7 +200,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%u\n", gb->field); \ + return sysfs_emit(buf, "%u\n", gb->field); \ } \ static DEVICE_ATTR_RO(field) @@ -209,7 +210,7 @@ static ssize_t field##_show(struct device *dev, \ char *buf) \ { \ struct gb_loopback *gb = dev_get_drvdata(dev); \ - return sprintf(buf, "%" #type "\n", gb->field); \ + return sysfs_emit(buf, "%" #type "\n", gb->field); \ } \ static ssize_t field##_store(struct device *dev, \ struct device_attribute *attr, \ -- 2.43.0