linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Linus Walleij <linus.walleij@linaro.org>,
	Jonathan Corbet <corbet@lwn.net>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Kent Gibson <warthog618@gmail.com>
Cc: linux-gpio@vger.kernel.org, linux-doc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v2 7/9] gpio: mockup: pass the chip label as device property
Date: Mon, 28 Sep 2020 12:41:53 +0200	[thread overview]
Message-ID: <20200928104155.7385-8-brgl@bgdev.pl> (raw)
In-Reply-To: <20200928104155.7385-1-brgl@bgdev.pl>

From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

While we do check the "chip-name" property in probe(), we never actually
use it. Let's pass the chip label to the driver using device properties
as we'll want to allow users to define their own once dynamically
created chips are supported.

The property is renamed to "chip-label" to not cause any confusion with
the actual chip name which is of the form: "gpiochipX".

If the "chip-label" property is missing, let's do what most devices in
drivers/gpio/ do and use dev_name().

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 drivers/gpio/gpio-mockup.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index de778b52f355..5b2686f9e07d 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -429,21 +429,14 @@ static int gpio_mockup_probe(struct platform_device *pdev)
 	if (rv)
 		return rv;
 
-	rv = device_property_read_string(dev, "chip-name", &name);
+	rv = device_property_read_string(dev, "chip-label", &name);
 	if (rv)
-		name = NULL;
+		name = dev_name(dev);
 
 	chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
 	if (!chip)
 		return -ENOMEM;
 
-	if (!name) {
-		name = devm_kasprintf(dev, GFP_KERNEL,
-				      "%s-%c", pdev->name, pdev->id + 'A');
-		if (!name)
-			return -ENOMEM;
-	}
-
 	mutex_init(&chip->lock);
 
 	gc = &chip->gc;
@@ -523,6 +516,7 @@ static int __init gpio_mockup_init(void)
 	int i, prop, num_chips, err = 0, base;
 	struct platform_device_info pdevinfo;
 	struct platform_device *pdev;
+	char chip_label[32];
 	u16 ngpio;
 
 	if ((gpio_mockup_num_ranges < 2) ||
@@ -556,6 +550,11 @@ static int __init gpio_mockup_init(void)
 		memset(&pdevinfo, 0, sizeof(pdevinfo));
 		prop = 0;
 
+		snprintf(chip_label, sizeof(chip_label),
+			 "gpio-mockup-%c", i + 'A');
+		properties[prop++] = PROPERTY_ENTRY_STRING("chip-label",
+							   chip_label);
+
 		base = gpio_mockup_range_base(i);
 		if (base >= 0)
 			properties[prop++] = PROPERTY_ENTRY_U32("gpio-base",
-- 
2.26.1


  parent reply	other threads:[~2020-09-28 10:42 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 10:41 [PATCH v2 0/9] gpio: mockup: refactoring + documentation Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 1/9] lib: string_helpers: provide kfree_strarray() Bartosz Golaszewski
2020-09-28 12:55   ` Andy Shevchenko
2020-09-28 13:04     ` Bartosz Golaszewski
2020-09-28 13:56       ` Andy Shevchenko
2020-09-28 15:59   ` Joe Perches
2020-09-28 16:02     ` Bartosz Golaszewski
2020-09-28 16:06       ` Joe Perches
2020-09-28 16:25         ` Andy Shevchenko
2020-09-29  8:10         ` David Laight
2020-09-29  8:49           ` Andy Shevchenko
2020-09-29  9:42             ` Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 2/9] Documentation: gpio: add documentation for gpio-mockup Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 3/9] gpio: mockup: drop unneeded includes Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 4/9] gpio: mockup: use KBUILD_MODNAME Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 5/9] gpio: mockup: use pr_fmt() Bartosz Golaszewski
2020-09-28 10:41 ` [PATCH v2 6/9] gpio: mockup: remove unneeded return statement Bartosz Golaszewski
2020-09-28 10:41 ` Bartosz Golaszewski [this message]
2020-09-28 13:00   ` [PATCH v2 7/9] gpio: mockup: pass the chip label as device property Andy Shevchenko
2020-09-28 13:13     ` Bartosz Golaszewski
2020-09-28 14:00       ` Andy Shevchenko
2020-09-28 14:52         ` Bartosz Golaszewski
2020-09-28 16:24           ` Andy Shevchenko
2020-09-28 10:41 ` [PATCH v2 8/9] gpio: mockup: use the generic 'gpio-line-names' property Bartosz Golaszewski
2020-09-28 13:01   ` Andy Shevchenko
2020-09-28 10:41 ` [PATCH v2 9/9] gpio: mockup: refactor the module init function Bartosz Golaszewski

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=20200928104155.7385-8-brgl@bgdev.pl \
    --to=brgl@bgdev.pl \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bgolaszewski@baylibre.com \
    --cc=corbet@lwn.net \
    --cc=linus.walleij@linaro.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=warthog618@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).