From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 7E6F3480DF1 for ; Tue, 12 May 2026 11:33:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778585612; cv=none; b=NM3k5LmW5mXbj5dr3WNoCFrbQKolMaDPGgkralHwQwW+gn/LODiRGbGbUTx5iekX6HnHjohxHstpF5XFnFhzDhsW44Z7S7uy0dJsYzDCga35Fdceft12KCzzAcV7v/zMIC6JVkGZH0Jo6JhvLxqOBHxLxE0h0pg9Al/ypNXKJSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778585612; c=relaxed/simple; bh=oV5trSatd2lnbsbgX/P/vC/Kfmo1mxbnyMoUebtCz1Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NWuP5yskgZ4gelOqntcwFvHLO4fl3S3zbkLXz3QXkZjrG6nZqAAImjyi6D09uphw+fQgDgZO62tcdn1x8Lac8d87uRma43fIxYRKz6YN/mbCeW5X6Gqw63fkpkHFb3Et3ggfaIMK5cu6dEmoH8QqTBWEX4v4YD1LCwr8fNpONcY= 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=qWb2VR8k; arc=none smtp.client-ip=209.85.214.182 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="qWb2VR8k" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2b4650d5f5cso20972485ad.0 for ; Tue, 12 May 2026 04:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778585609; x=1779190409; 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=6u7C+42zkCS/N/7M4vn74eaOM1O2j7PPPzqiyejc6HA=; b=qWb2VR8kzblihSpm6Tfqt1apsOW+znyLlyL7MpDwPdoxJ4Iud+iRcLPBhb8cOFoKUj 0fm+seKLoqhToWcslKpRANCxCrGJPYU43QZoz8SXqM5Wle/xWK3vxW3H+l/CwVCNXHZh m/ltCQLtOslUeLUvWyzHBgqKc94qj5KkXpVeaDgnOKkfqg8D1dkk3O5uh7RxqleaJD6F Xc8CgySSRBOYTJFhfmQi7z2sFSUIBs82LFTSSjnZQLlZQMK9D4M9k5F0CFuZrnQhAi3n VmBfkok05UHFEp0rkgurrFcFChAIqWIZ1Z82W+RQThBg0LX6YBXuRShXWk/kOADprps5 Y2/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778585609; x=1779190409; 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=6u7C+42zkCS/N/7M4vn74eaOM1O2j7PPPzqiyejc6HA=; b=YEkFsv3Fx57yDNeYSDTfYVTkklWtsQxYvLoo4Xg41upnvraU3i57AJZ1ersExVj++p R1C4PcTLt8r4i36cIFVLJ5gDL/ZoHxdJ0yWDoe6kgKEovF6F9vgA2yKUTyipj//aGEbo 6Uu5sGU3I2fX4mxLiqP+RE+d1Gq50IVZMHzbiun4DYhWnC1b2eZgKkBnY4HKhQf8gw3P kxd+vwWmx5VBHbI9M0v1OFfasLbmPXI/cqrmA0W37WftfhifJV5GnBMHxnEXgDX1Z82c wHhulJz7iFHGz9mu3NkyfXFNGony7bIjC+k4lfMx5wqhJbHZtCsLP7sPWJSz1hzmSJ5v t2Mg== X-Forwarded-Encrypted: i=1; AFNElJ+ng8tTghMmNPKW3MOv2C9mcNzR5MMJ3fxA3eLb2WujQOHrdpy11hYPU/Oa5XDxPKP+8G5AqUslYdFoxos=@vger.kernel.org X-Gm-Message-State: AOJu0YwNsd84Lg9WrsHKKAh3Lww4RDmIcHQZF2GUHK0FjdtWJMnVQJo9 ehYnRpWLXF2g5DQbzb3u+xmy17yDEwKkdEtmK7Vxaac7lgDsl/Uep7U8 X-Gm-Gg: Acq92OEC4W3hULye03Bth8A4hJbvpSlRXEtU/KoePduMkqF0N9t/oIhbMqL5wkTo0/6 hrazkVY2cfDpStrqzhJo3zJHDd8GBbV4CmgRUtNk1XbnANzeETCWx5NiflIGh/n/PjrK/fuPNIH x+tD1OVwbN+xLwUFiCNL0VP+M2ykTni5L/c4v02zxxp4W9kzQYlx5N128OuhGL21VXTqWFeZjSA oqKOBF55ZWKM4DHtYAsLXMEE2kSYSJYR+E9YZjNUWeECOAfCEcsC24TMiLn90t83aSpv+QoXcLh Dtl0+nf0tcBn8CkTeAL+WkYeOgia0EvUCOZY1IVYbJce+Np/0KWTd+N+h57y/aBBmyB+t9awHLi m5Nm9iZQbk8+0Lpn2QE9AT4/eRB58idfn+y7CKjPdJuj77pTkj/mfAcJB9mz7lByFKGHZ+6yHA4 Go008soKgYFiNm98Mx4S2PBb6OevUnLSpqTCYHIuue X-Received: by 2002:a17:903:1ab0:b0:2b2:4ffc:a7c4 with SMTP id d9443c01a7336-2ba798c0a22mr259852635ad.24.1778585608644; Tue, 12 May 2026 04:33:28 -0700 (PDT) Received: from MAHADEV.localdomain ([103.135.229.217]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d405adsm136279535ad.28.2026.05.12.04.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 04:33:28 -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 Subject: [PATCH] staging: fbtft: convert sysfs attributes to use ATTRIBUTE_GROUPS Date: Tue, 12 May 2026 11:33:20 +0000 Message-ID: <20260512113320.2548-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 --- drivers/staging/fbtft/fbtft-core.c | 3 - drivers/staging/fbtft/fbtft-sysfs.c | 86 +++++++++++------------------ drivers/staging/fbtft/fbtft.h | 2 + drivers/staging/fbtft/internal.h | 3 +- 4 files changed, 35 insertions(+), 59 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..416172533e33 100644 --- a/drivers/staging/fbtft/fbtft-sysfs.c +++ b/drivers/staging/fbtft/fbtft-sysfs.c @@ -142,37 +142,6 @@ static ssize_t show_gamma_curve(struct device *device, return sprintf_gamma(par, par->gamma.curves, buf); } -static struct device_attribute gamma_device_attrs[] = { - __ATTR(gamma, 0660, show_gamma_curve, store_gamma_curve), -}; - -void fbtft_expand_debug_value(unsigned long *debug) -{ - switch (*debug & 0x7) { - case 1: - *debug |= DEBUG_LEVEL_1; - break; - case 2: - *debug |= DEBUG_LEVEL_2; - break; - case 3: - *debug |= DEBUG_LEVEL_3; - break; - case 4: - *debug |= DEBUG_LEVEL_4; - break; - case 5: - *debug |= DEBUG_LEVEL_5; - break; - case 6: - *debug |= DEBUG_LEVEL_6; - break; - case 7: - *debug = 0xFFFFFFFF; - break; - } -} - static ssize_t store_debug(struct device *device, struct device_attribute *attr, const char *buf, size_t count) @@ -198,31 +167,40 @@ static ssize_t show_debug(struct device *device, return sysfs_emit(buf, "%lu\n", par->debug); } -static struct device_attribute debug_device_attr = - __ATTR(debug, 0660, show_debug, store_debug); - -void fbtft_sysfs_init(struct fbtft_par *par) +void fbtft_expand_debug_value(unsigned long *debug) { - 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]); + switch (*debug & 0x7) { + case 1: + *debug |= DEBUG_LEVEL_1; + break; + case 2: + *debug |= DEBUG_LEVEL_2; + break; + case 3: + *debug |= DEBUG_LEVEL_3; + break; + case 4: + *debug |= DEBUG_LEVEL_4; + break; + case 5: + *debug |= DEBUG_LEVEL_5; + break; + case 6: + *debug |= DEBUG_LEVEL_6; + break; + case 7: + *debug = 0xFFFFFFFF; + break; + } } -void fbtft_sysfs_exit(struct fbtft_par *par) -{ - struct device *dev; +static DEVICE_ATTR_RW(debug); +static DEVICE_ATTR_RW(gamma); - 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..ab71db017d05 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -299,6 +299,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 +329,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..39fd1e167b41 100644 --- a/drivers/staging/fbtft/internal.h +++ b/drivers/staging/fbtft/internal.h @@ -4,8 +4,7 @@ #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); +extern const struct attribute_group *fbtft_groups[]; 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