From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-gpio@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 4/8] pinctrl: lynxpoint: Keep pointer to struct device instead of its container
Date: Wed, 6 Nov 2019 16:48:25 +0200 [thread overview]
Message-ID: <20191106144829.32275-5-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20191106144829.32275-1-andriy.shevchenko@linux.intel.com>
There is no need to keep pointer to struct platform_device, which is container
of struct device, because the latter is what have been used everywhere outside
of ->probe() path. In any case we may derive pointer to the container when
needed.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/pinctrl/intel/pinctrl-lynxpoint.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/pinctrl/intel/pinctrl-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
index ebc523233df4..dbca1ff076c8 100644
--- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c
+++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
@@ -46,7 +46,7 @@
struct lp_gpio {
struct gpio_chip chip;
- struct platform_device *pdev;
+ struct device *dev;
raw_spinlock_t lock;
unsigned long reg_base;
};
@@ -103,11 +103,11 @@ static int lp_gpio_request(struct gpio_chip *chip, unsigned offset)
unsigned long conf2 = lp_gpio_reg(chip, offset, LP_CONFIG2);
unsigned long acpi_use = lp_gpio_reg(chip, offset, LP_ACPI_OWNED);
- pm_runtime_get(&lg->pdev->dev); /* should we put if failed */
+ pm_runtime_get(lg->dev); /* should we put if failed */
/* Fail if BIOS reserved pin for ACPI use */
if (!(inl(acpi_use) & BIT(offset % 32))) {
- dev_err(&lg->pdev->dev, "gpio %d reserved for ACPI\n", offset);
+ dev_err(lg->dev, "gpio %d reserved for ACPI\n", offset);
return -EBUSY;
}
/* Fail if pin is in alternate function mode (not GPIO mode) */
@@ -129,7 +129,7 @@ static void lp_gpio_free(struct gpio_chip *chip, unsigned offset)
/* disable input sensing */
outl(inl(conf2) | GPINDIS_BIT, conf2);
- pm_runtime_put(&lg->pdev->dev);
+ pm_runtime_put(lg->dev);
}
static int lp_irq_type(struct irq_data *d, unsigned type)
@@ -325,7 +325,7 @@ static int lp_gpio_probe(struct platform_device *pdev)
if (!lg)
return -ENOMEM;
- lg->pdev = pdev;
+ lg->dev = dev;
platform_set_drvdata(pdev, lg);
io_rc = platform_get_resource(pdev, IORESOURCE_IO, 0);
--
2.24.0.rc1
next prev parent reply other threads:[~2019-11-06 14:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 14:48 [PATCH v1 0/8] pinctrl: intel: Move Lynxpoint to pin control umbrella Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 1/8] pinctrl: lynxpoint: Move GPIO driver to pin controller folder Andy Shevchenko
2019-11-07 13:48 ` Mika Westerberg
2019-11-07 14:47 ` Andy Shevchenko
2019-11-13 9:54 ` Linus Walleij
2019-11-13 13:40 ` Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 2/8] pinctrl: lynxpoint: Use raw_spinlock for locking Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 3/8] pinctrl: lynxpoint: Correct amount of pins Andy Shevchenko
2019-11-06 14:48 ` Andy Shevchenko [this message]
2019-11-06 14:48 ` [PATCH v1 5/8] pinctrl: lynxpoint: Use %pR to print IO resource Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 6/8] pinctrl: lynxpoint: Switch to memory mapped IO accessors Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 7/8] pinctrl: lynxpoint: Convert unsigned to unsigned int Andy Shevchenko
2019-11-06 14:48 ` [PATCH v1 8/8] pinctrl: lynxpoint: Move ->remove closer to ->probe() Andy Shevchenko
2019-11-13 9:54 ` [PATCH v1 0/8] pinctrl: intel: Move Lynxpoint to pin control umbrella Linus Walleij
2019-11-25 12:02 ` Andy Shevchenko
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=20191106144829.32275-5-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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).