From: Johan Hovold <johan@kernel.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>
Subject: [PATCH v2 04/23] gpio: sysfs: preparatory clean ups
Date: Mon, 4 May 2015 17:10:29 +0200 [thread overview]
Message-ID: <1430752248-15401-5-git-send-email-johan@kernel.org> (raw)
In-Reply-To: <1430752248-15401-1-git-send-email-johan@kernel.org>
Put the recently introduced gpio-chip pointer to some more use in
gpiod_export.
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/gpio/gpiolib-sysfs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index b2b62cc6f9e1..658ed28e6d7d 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -599,7 +599,7 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
goto fail_unlock;
}
- if (desc->chip->direction_input && desc->chip->direction_output &&
+ if (chip->direction_input && chip->direction_output &&
direction_may_change) {
set_bit(FLAG_SYSFS_DIR, &desc->flags);
}
@@ -607,10 +607,10 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)
spin_unlock_irqrestore(&gpio_lock, flags);
offset = gpio_chip_hwgpio(desc);
- if (desc->chip->names && desc->chip->names[offset])
- ioname = desc->chip->names[offset];
+ if (chip->names && chip->names[offset])
+ ioname = chip->names[offset];
- dev = device_create_with_groups(&gpio_class, desc->chip->dev,
+ dev = device_create_with_groups(&gpio_class, chip->dev,
MKDEV(0, 0), desc, gpio_groups,
ioname ? ioname : "gpio%u",
desc_to_gpio(desc));
--
2.0.5
next prev parent reply other threads:[~2015-05-04 15:13 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-04 15:10 [PATCH v2 00/23] gpio: sysfs: fixes and clean ups Johan Hovold
2015-05-04 15:10 ` [PATCH v2 01/23] gpio: sysfs: fix memory leaks and device hotplug Johan Hovold
2015-05-04 15:10 ` [PATCH v2 02/23] gpio: clean up gpiochip_remove Johan Hovold
2015-05-12 7:58 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 03/23] gpio: sysfs: fix redundant lock-as-irq handling Johan Hovold
2015-05-12 7:59 ` Linus Walleij
2015-05-04 15:10 ` Johan Hovold [this message]
2015-05-12 8:00 ` [PATCH v2 04/23] gpio: sysfs: preparatory clean ups Linus Walleij
2015-05-04 15:10 ` [PATCH v2 05/23] gpio: sysfs: reduce gpiochip-export locking scope Johan Hovold
2015-05-12 8:05 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 06/23] gpio: sysfs: clean up chip class-device handling Johan Hovold
2015-05-12 8:14 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 07/23] gpio: sysfs: rename gpiochip registration functions Johan Hovold
2015-05-12 8:24 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 08/23] gpio: remove gpiod_sysfs_set_active_low Johan Hovold
2015-05-12 8:27 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 09/23] gpio: sysfs: use DEVICE_ATTR macros Johan Hovold
2015-05-12 8:28 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 10/23] gpio: sysfs: release irq after class-device deregistration Johan Hovold
2015-05-12 8:29 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 11/23] gpio: sysfs: remove redundant export tests Johan Hovold
2015-05-12 8:30 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 12/23] gpio: sysfs: add gpiod class-device data Johan Hovold
2015-05-12 8:31 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 13/23] gpio: sysfs: remove redundant gpio-descriptor parameters Johan Hovold
2015-05-12 8:32 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 14/23] gpio: sysfs: clean up interrupt-interface implementation Johan Hovold
2015-05-12 8:34 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 15/23] gpio: sysfs: only call irq helper if needed Johan Hovold
2015-05-12 8:35 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 16/23] gpio: sysfs: split irq allocation and deallocation Johan Hovold
2015-05-12 8:36 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 17/23] gpio: sysfs: clean up edge_store Johan Hovold
2015-05-12 8:37 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 18/23] gpio: sysfs: clean up gpiod_export_link locking Johan Hovold
2015-05-12 8:38 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 19/23] gpio: sysfs: use per-gpio locking Johan Hovold
2015-05-12 8:39 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 20/23] gpio: sysfs: fix race between gpiod export and unexport Johan Hovold
2015-05-12 8:42 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 21/23] gpio: sysfs: rename active-low helper Johan Hovold
2015-05-12 8:43 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 22/23] gpio: sysfs: remove FLAG_SYSFS_DIR Johan Hovold
2015-05-12 8:44 ` Linus Walleij
2015-05-04 15:10 ` [PATCH v2 23/23] gpio: sysfs: move irq trigger flags to class-device data Johan Hovold
2015-05-12 8:45 ` Linus Walleij
2015-05-12 6:37 ` [PATCH v2 00/23] gpio: sysfs: fixes and clean ups Alexandre Courbot
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=1430752248-15401-5-git-send-email-johan@kernel.org \
--to=johan@kernel.org \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).