All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Michael Hennerich <michael.hennerich@analog.com>
Subject: [PATCH 06/22] Input: ad7879 - use device core to create driver-specific device attributes
Date: Fri, 28 Jul 2023 17:51:15 -0700	[thread overview]
Message-ID: <20230729005133.1095051-6-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20230729005133.1095051-1-dmitry.torokhov@gmail.com>

Instead of creating driver-specific device attributes with
devm_device_add_group() have device core do this by setting up dev_groups
pointer in the driver structure.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/touchscreen/ad7879-i2c.c |  7 ++++---
 drivers/input/touchscreen/ad7879-spi.c |  7 ++++---
 drivers/input/touchscreen/ad7879.c     | 10 ++++++----
 drivers/input/touchscreen/ad7879.h     |  3 +++
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c
index feaa6f8b01ed..5c094ab74698 100644
--- a/drivers/input/touchscreen/ad7879-i2c.c
+++ b/drivers/input/touchscreen/ad7879-i2c.c
@@ -58,9 +58,10 @@ MODULE_DEVICE_TABLE(of, ad7879_i2c_dt_ids);
 
 static struct i2c_driver ad7879_i2c_driver = {
 	.driver = {
-		.name	= "ad7879",
-		.pm	= &ad7879_pm_ops,
-		.of_match_table = of_match_ptr(ad7879_i2c_dt_ids),
+		.name		= "ad7879",
+		.dev_groups	= ad7879_groups,
+		.pm		= &ad7879_pm_ops,
+		.of_match_table	= of_match_ptr(ad7879_i2c_dt_ids),
 	},
 	.probe		= ad7879_i2c_probe,
 	.id_table	= ad7879_id,
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c
index 50e889846800..064968fe57cf 100644
--- a/drivers/input/touchscreen/ad7879-spi.c
+++ b/drivers/input/touchscreen/ad7879-spi.c
@@ -56,9 +56,10 @@ MODULE_DEVICE_TABLE(of, ad7879_spi_dt_ids);
 
 static struct spi_driver ad7879_spi_driver = {
 	.driver = {
-		.name	= "ad7879",
-		.pm	= &ad7879_pm_ops,
-		.of_match_table = of_match_ptr(ad7879_spi_dt_ids),
+		.name		= "ad7879",
+		.dev_groups	= ad7879_groups,
+		.pm		= &ad7879_pm_ops,
+		.of_match_table	= of_match_ptr(ad7879_spi_dt_ids),
 	},
 	.probe		= ad7879_spi_probe,
 };
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index e850853328f1..e5d69bf2276e 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -391,6 +391,12 @@ static const struct attribute_group ad7879_attr_group = {
 	.attrs = ad7879_attributes,
 };
 
+const struct attribute_group *ad7879_groups[] = {
+	&ad7879_attr_group,
+	NULL
+};
+EXPORT_SYMBOL_GPL(ad7879_groups);
+
 #ifdef CONFIG_GPIOLIB
 static int ad7879_gpio_direction_input(struct gpio_chip *chip,
 					unsigned gpio)
@@ -612,10 +618,6 @@ int ad7879_probe(struct device *dev, struct regmap *regmap,
 
 	__ad7879_disable(ts);
 
-	err = devm_device_add_group(dev, &ad7879_attr_group);
-	if (err)
-		return err;
-
 	err = ad7879_gpio_add(ts);
 	if (err)
 		return err;
diff --git a/drivers/input/touchscreen/ad7879.h b/drivers/input/touchscreen/ad7879.h
index ae8aa1428e56..d71a8e787290 100644
--- a/drivers/input/touchscreen/ad7879.h
+++ b/drivers/input/touchscreen/ad7879.h
@@ -8,11 +8,14 @@
 #ifndef _AD7879_H_
 #define _AD7879_H_
 
+#include <linux/pm.h>
 #include <linux/types.h>
 
+struct attribute_group;
 struct device;
 struct regmap;
 
+extern const struct attribute_group *ad7879_groups[];
 extern const struct dev_pm_ops ad7879_pm_ops;
 
 int ad7879_probe(struct device *dev, struct regmap *regmap,
-- 
2.41.0.487.g6d72f3e995-goog


  parent reply	other threads:[~2023-07-29  0:53 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-29  0:51 [PATCH 01/22] Input: cros_ec_keyb - use device core to create driver-specific device attributes Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 02/22] Input: cyapa " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 03/22] Input: iqs269a " Dmitry Torokhov
2023-07-31 15:41   ` Jeff LaBundy
2023-08-02 13:01   ` Mattijs Korpershoek
2023-07-29  0:51 ` [PATCH 04/22] Input: kxtj9 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 05/22] Input: ad7877 " Dmitry Torokhov
2023-07-31  5:23   ` Hennerich, Michael
2023-07-29  0:51 ` Dmitry Torokhov [this message]
2023-07-31  5:23   ` [PATCH 06/22] Input: ad7879 " Hennerich, Michael
2023-07-29  0:51 ` [PATCH 07/22] Input: ads7846 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 08/22] Input: edt-ft5x06 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 09/22] Input: elants_i2c " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 10/22] Input: exc3000 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 11/22] Input: hideep " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 12/22] Input: hycon-hy46xx " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 13/22] Input: ili210x " Dmitry Torokhov
2023-07-29 15:07   ` Marek Vasut
2023-07-30 11:38     ` Greg Kroah-Hartman
2023-07-30 12:24       ` Marek Vasut
2023-07-29  0:51 ` [PATCH 14/22] Input: ilitek_ts_i2c " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 15/22] Input: iqs5xx " Dmitry Torokhov
2023-07-31 15:43   ` Jeff LaBundy
2023-07-29  0:51 ` [PATCH 16/22] Input: melfas-mip4 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 17/22] Input: raydium_i2c_ts " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 18/22] Input: rohm_bu21023 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 19/22] Input: s6sy761 " Dmitry Torokhov
2023-07-30 13:02   ` Andi Shyti
2023-07-29  0:51 ` [PATCH 20/22] Input: stmfts " Dmitry Torokhov
2023-07-30 13:02   ` Andi Shyti
2023-07-29  0:51 ` [PATCH 21/22] Input: tsc2004/5 " Dmitry Torokhov
2023-07-29  0:51 ` [PATCH 22/22] Input: wdt87xx_i2c " Dmitry Torokhov
2023-07-29  2:40 ` [PATCH 01/22] Input: cros_ec_keyb " Guenter Roeck
2023-07-30 11:39 ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230729005133.1095051-6-dmitry.torokhov@gmail.com \
    --to=dmitry.torokhov@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.hennerich@analog.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.