From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 41D0039281D for ; Wed, 13 May 2026 06:43:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778654597; cv=none; b=hpeQa9/Dg/U9UZzhfXyHibeiEx8AglAHzUK3oIOJH2RnMLo39FcZ7ia9Ej5+9dtWCEpnyQlonWQyh8BrMudb9IX6RGh+XGGhHTxL8LUlnI8PNsudUlCFRDjA5ZXz1i7HgO4h3PaEfeeOLZRFPKlzcZzjxgEB2Ni2zkZDDl7zIoE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778654597; c=relaxed/simple; bh=Q4YPQlo7gwRvDV9/x1R33vYQjZUydBveTnvcjWiecPQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NjmAW/l4OGv4EXxKo96ZG3YN9f86lqJ88UvlgufGIPjowoE7kxVqejCMbFWJWZ4uXTsuy7WN0jmnfS7eKUlcDwkParQOQufkrIrVfUSAnUs/gCrdIojcWSi56EGRDp8XmpXzbC9dA+Gk/gGicIcpItBfkKqZfUUkIE4zoB26k6M= 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=Hwsal6I6; arc=none smtp.client-ip=209.85.215.169 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="Hwsal6I6" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c827313dac0so1720410a12.1 for ; Tue, 12 May 2026 23:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778654594; x=1779259394; 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=55alrhY2zIYtMPfbO1NXYJvxjlF+zysdW1Gb8jsYWrY=; b=Hwsal6I6eG+eV/aQRpAsw2wehWALsDVhzY+aIpPJvIcPqiFcIQA8+3h4P4oBsXVk2K YD9Okved3jzDAyvqgzDJmMXHRsoNoTC2PgISX62x0VJl8ii8wApgxed52Ux2nlYmLWz+ h2tcmICZeDNpnBG2DfgLIKMRmeM2aPwUFO/Ymo1KbuKU1uuegdk+Gy+tCujcWC4cVPzG yHP04D2r+XsvkR1F+AvmILpAN89hwY0bNJ85JEt8+OyA9Q/K7u2TT6RPrP5zU1xOTSKr 73pSXlwF39YoHb4v16EIWrFGshXzKKx1Y86frkWaI5DviOQ+4fcr2OgBsPhOvuGjx4Yq L9qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778654594; x=1779259394; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=55alrhY2zIYtMPfbO1NXYJvxjlF+zysdW1Gb8jsYWrY=; b=Km8snrR/bBbA3CisyTEN57V8jEtuYHglbUXtvoqy7pbwU0DrtNMiw3zaNd9x7wdBgY Yui9FBg/xGgavKVSXiq4YBeh7skmRh8r2YeGouI88RZxAXEJStKwDRyyo9zApmLcm+9c LI60l43MiyfayiJmBuj0QVPsg7Lh1DY7RHGw9UOYujsxTwGuHHIw0U0wtJ1O5t4RIyJc t/OwF8FrPmxqDD5x2/BlreatU5uasQ9HOw8Sb8Q/sr/3j/XjhBIl7wRIiIELQnIUNysS xwQQuPBYxVjgqcya/LL12hwyraAmRObUUHxprWghYwrDqtse7tcu4m/vxujri1Hzljyh hoBg== X-Forwarded-Encrypted: i=1; AFNElJ+wHdChotRHxbh0/FOP+MaG+Qe7tBdOBrIzv1tvW+w/v2mGZK7nCtdldeWObaf3hJY9PGStdUBLDZ1v3sc=@vger.kernel.org X-Gm-Message-State: AOJu0YzUTSrTTJ+GP3V6I/jkl6RrbwKwZ1PVOvisVsh2aBkZdnxnsbGD P1vACCO/3h/2Nwg3pbkJNRttIFDbla/7H65Jb1vVi3t7xTUvK0mbdMwe X-Gm-Gg: Acq92OFEd72myMa4bMUrBpwF0qeWS3DTgt6XRh/MehLxYO3UElNXfnyCH/Kfbv9pD9t Sa0IRT+cwEo/Q1RMz9KkjyOMVhrkztTzPJUBZ4oNmFXoyIfPlKNfen39kLxQRgDRBbRqK88XKtu BcOr8y8DSSjWA3AZDmPkFW0Ai9cotVustXJLB9ge4UNjC6amGVehO5tUdOMjJ2BghI/mdzMc/Hx TIFAjxr9RQIFnKaJc9YVL5xYRxAhbGGJRroBqNMlJUEzNQ9qk184YkgOM2wcJ1IGXAq5/qBtXSw N+vFrVnIwEUlKF4BSSKLZYJbWnAfEwtHy8K0mcibXERfvMjNI6R09iFQllHplMo1OJG60nsWgEL KLe9Kem29oUZ+flx9w8nAHltsUFDgyKiQoyvM7zYYNyLwro1Uiph2eVMhrSzB6ZWBlAJFpjCxoz h1ahyk+Lvjf2f6Y+SgReaUk6N+VjLlgkNiNprFqfdeBj0XDpm00r4= X-Received: by 2002:a05:6a20:94ca:b0:39f:c93e:c7f7 with SMTP id adf61e73a8af0-3af60cf9d74mr2213436637.0.1778654594433; Tue, 12 May 2026 23:43:14 -0700 (PDT) Received: from MAHADEV.localdomain ([103.175.168.230]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c8267689d76sm13748809a12.11.2026.05.12.23.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 23:43:13 -0700 (PDT) From: Harshit Shaw To: andriy.shevchenko@intel.com Cc: gregkh@linuxfoundation.org, error27@gmail.com, deller@gmx.de, chintanlike@gmail.com, tzimmermann@suse.de, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Harshit Shaw , kernel test robot Subject: [PATCH v4] staging: fbtft: convert sysfs attributes to use ATTRIBUTE_GROUPS Date: Wed, 13 May 2026 06:42:57 +0000 Message-ID: <20260513064257.1238-1-shawharshit116@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace direct device_create_file() calls with the correct ATTRIBUTE_GROUPS() macro. Add fbtft_groups as dev_groups in the driver structure so the driver core automatically adds and removes the sysfs attributes when a device is bound or unbound. Signed-off-by: Harshit Shaw Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202605131232.m3YE1tEv-lkp@intel.com/ Reviewed-by: Andy Shevchenko --- v4: Fix build error - add extern declaration of fbtft_groups in fbtft.h so all drivers using FBTFT_REGISTER_DRIVER macro can see the symbol v3: Remove stray blank line in fbtft_attrs[] array v2: - Use DEVICE_ATTR_RW() macro instead of DEVICE_ATTR() - Move DEVICE_ATTR_RW() definitions closer to their callbacks - Remove trailing comma after NULL in attribute array - Use ATTRIBUTE_GROUPS() macro and add dev_groups to driver structure as suggested by Greg KH and Andy Shevchenko - Compile tested with: make M=drivers/staging/fbtft modules drivers/staging/fbtft/fbtft-core.c | 3 -- drivers/staging/fbtft/fbtft-sysfs.c | 81 +++++++++++------------------ drivers/staging/fbtft/fbtft.h | 6 +++ drivers/staging/fbtft/internal.h | 2 - 4 files changed, 36 insertions(+), 56 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c index 3da42c8ca6e3..e6d33127cecc 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -782,8 +782,6 @@ int fbtft_register_framebuffer(struct fb_info *fb_info) if (ret < 0) goto reg_fail; - fbtft_sysfs_init(par); - if (par->txbuf.buf && par->txbuf.len >= 1024) sprintf(text1, ", %zu KiB buffer memory", par->txbuf.len >> 10); if (spi) @@ -826,7 +824,6 @@ int fbtft_unregister_framebuffer(struct fb_info *fb_info) if (par->fbtftops.unregister_backlight) par->fbtftops.unregister_backlight(par); - fbtft_sysfs_exit(par); unregister_framebuffer(fb_info); return 0; diff --git a/drivers/staging/fbtft/fbtft-sysfs.c b/drivers/staging/fbtft/fbtft-sysfs.c index d05599d80011..579ac9dcdd9f 100644 --- a/drivers/staging/fbtft/fbtft-sysfs.c +++ b/drivers/staging/fbtft/fbtft-sysfs.c @@ -107,9 +107,18 @@ sprintf_gamma(struct fbtft_par *par, u32 *curves, char *buf) return len; } -static ssize_t store_gamma_curve(struct device *device, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t gamma_show(struct device *device, + struct device_attribute *attr, char *buf) +{ + struct fb_info *fb_info = dev_get_drvdata(device); + struct fbtft_par *par = fb_info->par; + + return sprintf_gamma(par, par->gamma.curves, buf); +} + +static ssize_t gamma_store(struct device *device, + struct device_attribute *attr, + const char *buf, size_t count) { struct fb_info *fb_info = dev_get_drvdata(device); struct fbtft_par *par = fb_info->par; @@ -133,18 +142,7 @@ static ssize_t store_gamma_curve(struct device *device, return count; } -static ssize_t show_gamma_curve(struct device *device, - struct device_attribute *attr, char *buf) -{ - struct fb_info *fb_info = dev_get_drvdata(device); - struct fbtft_par *par = fb_info->par; - - return sprintf_gamma(par, par->gamma.curves, buf); -} - -static struct device_attribute gamma_device_attrs[] = { - __ATTR(gamma, 0660, show_gamma_curve, store_gamma_curve), -}; +static DEVICE_ATTR_RW(gamma); void fbtft_expand_debug_value(unsigned long *debug) { @@ -173,7 +171,16 @@ void fbtft_expand_debug_value(unsigned long *debug) } } -static ssize_t store_debug(struct device *device, +static ssize_t debug_show(struct device *device, + struct device_attribute *attr, char *buf) +{ + struct fb_info *fb_info = dev_get_drvdata(device); + struct fbtft_par *par = fb_info->par; + + return sysfs_emit(buf, "%lu\n", par->debug); +} + +static ssize_t debug_store(struct device *device, struct device_attribute *attr, const char *buf, size_t count) { @@ -189,40 +196,12 @@ static ssize_t store_debug(struct device *device, return count; } -static ssize_t show_debug(struct device *device, - struct device_attribute *attr, char *buf) -{ - struct fb_info *fb_info = dev_get_drvdata(device); - struct fbtft_par *par = fb_info->par; - - return sysfs_emit(buf, "%lu\n", par->debug); -} +static DEVICE_ATTR_RW(debug); -static struct device_attribute debug_device_attr = - __ATTR(debug, 0660, show_debug, store_debug); - -void fbtft_sysfs_init(struct fbtft_par *par) -{ - struct device *dev; - - dev = dev_of_fbinfo(par->info); - if (!dev) - return; - - device_create_file(dev, &debug_device_attr); - if (par->gamma.curves && par->fbtftops.set_gamma) - device_create_file(dev, &gamma_device_attrs[0]); -} - -void fbtft_sysfs_exit(struct fbtft_par *par) -{ - struct device *dev; - - dev = dev_of_fbinfo(par->info); - if (!dev) - return; +static struct attribute *fbtft_attrs[] = { + &dev_attr_debug.attr, + &dev_attr_gamma.attr, + NULL +}; - device_remove_file(dev, &debug_device_attr); - if (par->gamma.curves && par->fbtftops.set_gamma) - device_remove_file(dev, &gamma_device_attrs[0]); -} +ATTRIBUTE_GROUPS(fbtft); diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h index 317be17b95c1..1a3b9691f24a 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -8,6 +8,7 @@ #include #include #include +#include #define FBTFT_ONBOARD_BACKLIGHT 2 @@ -274,6 +275,9 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...); void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...); void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...); +/* fbtft-sysfs.c */ +extern const struct attribute_group *fbtft_groups[]; + #define FBTFT_DT_TABLE(_compatible) \ static const struct of_device_id dt_ids[] = { \ { .compatible = _compatible }, \ @@ -299,6 +303,7 @@ static struct spi_driver fbtft_driver_spi_driver = { \ .driver = { \ .name = _name, \ .of_match_table = dt_ids, \ + .dev_groups = fbtft_groups, \ }, \ .id_table = _spi_ids, \ .probe = fbtft_driver_probe_spi, \ @@ -328,6 +333,7 @@ static struct platform_driver fbtft_driver_platform_driver = { \ .name = _name, \ .owner = THIS_MODULE, \ .of_match_table = dt_ids, \ + .dev_groups = fbtft_groups, \ }, \ .probe = fbtft_driver_probe_pdev, \ .remove = fbtft_driver_remove_pdev, \ diff --git a/drivers/staging/fbtft/internal.h b/drivers/staging/fbtft/internal.h index ae2ff4a4a472..7869cf8dbf2a 100644 --- a/drivers/staging/fbtft/internal.h +++ b/drivers/staging/fbtft/internal.h @@ -4,8 +4,6 @@ #ifndef __LINUX_FBTFT_INTERNAL_H #define __LINUX_FBTFT_INTERNAL_H -void fbtft_sysfs_init(struct fbtft_par *par); -void fbtft_sysfs_exit(struct fbtft_par *par); void fbtft_expand_debug_value(unsigned long *debug); int fbtft_gamma_parse_str(struct fbtft_par *par, u32 *curves, const char *str, int size); -- 2.53.0