From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 3/5] irqchip/renesas-irqc: Add helper variable dev = &pdev->dev
Date: Mon, 29 Apr 2019 17:20:04 +0200 [thread overview]
Message-ID: <20190429152006.22593-4-geert+renesas@glider.be> (raw)
In-Reply-To: <20190429152006.22593-1-geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/irqchip/irq-renesas-irqc.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 0955ffe12b32eb36..3cc428ba495c3793 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -124,10 +124,11 @@ static irqreturn_t irqc_irq_handler(int irq, void *dev_id)
static int irqc_probe(struct platform_device *pdev)
{
+ struct device *dev = &pdev->dev;
+ const char *name = dev_name(dev);
struct irqc_priv *p;
struct resource *io;
struct resource *irq;
- const char *name = dev_name(&pdev->dev);
int ret;
int k;
@@ -140,13 +141,13 @@ static int irqc_probe(struct platform_device *pdev)
p->pdev = pdev;
platform_set_drvdata(pdev, p);
- pm_runtime_enable(&pdev->dev);
- pm_runtime_get_sync(&pdev->dev);
+ pm_runtime_enable(dev);
+ pm_runtime_get_sync(dev);
/* get hold of manadatory IOMEM */
io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!io) {
- dev_err(&pdev->dev, "not enough IOMEM resources\n");
+ dev_err(dev, "not enough IOMEM resources\n");
ret = -EINVAL;
goto err1;
}
@@ -164,7 +165,7 @@ static int irqc_probe(struct platform_device *pdev)
p->number_of_irqs = k;
if (p->number_of_irqs < 1) {
- dev_err(&pdev->dev, "not enough IRQ resources\n");
+ dev_err(dev, "not enough IRQ resources\n");
ret = -EINVAL;
goto err1;
}
@@ -178,12 +179,11 @@ static int irqc_probe(struct platform_device *pdev)
p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */
- p->irq_domain = irq_domain_add_linear(pdev->dev.of_node,
- p->number_of_irqs,
+ p->irq_domain = irq_domain_add_linear(dev->of_node, p->number_of_irqs,
&irq_generic_chip_ops, p);
if (!p->irq_domain) {
ret = -ENXIO;
- dev_err(&pdev->dev, "cannot initialize irq domain\n");
+ dev_err(dev, "cannot initialize irq domain\n");
goto err2;
}
@@ -191,7 +191,7 @@ static int irqc_probe(struct platform_device *pdev)
1, name, handle_level_irq,
0, 0, IRQ_GC_INIT_NESTED_LOCK);
if (ret) {
- dev_err(&pdev->dev, "cannot allocate generic chip\n");
+ dev_err(dev, "cannot allocate generic chip\n");
goto err3;
}
@@ -209,13 +209,13 @@ static int irqc_probe(struct platform_device *pdev)
for (k = 0; k < p->number_of_irqs; k++) {
if (request_irq(p->irq[k].requested_irq, irqc_irq_handler,
0, name, &p->irq[k])) {
- dev_err(&pdev->dev, "failed to request IRQ\n");
+ dev_err(dev, "failed to request IRQ\n");
ret = -ENOENT;
goto err4;
}
}
- dev_info(&pdev->dev, "driving %d irqs\n", p->number_of_irqs);
+ dev_info(dev, "driving %d irqs\n", p->number_of_irqs);
return 0;
err4:
@@ -227,8 +227,8 @@ static int irqc_probe(struct platform_device *pdev)
err2:
iounmap(p->iomem);
err1:
- pm_runtime_put(&pdev->dev);
- pm_runtime_disable(&pdev->dev);
+ pm_runtime_put(dev);
+ pm_runtime_disable(dev);
kfree(p);
err0:
return ret;
--
2.17.1
next prev parent reply other threads:[~2019-04-29 15:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-29 15:20 [PATCH 0/5] irqchip/renesas-irqc: Miscellaneous cleanups and improvements Geert Uytterhoeven
2019-04-29 15:20 ` [PATCH 1/5] irqchip/renesas-irqc: Remove unneeded inclusion of <linux/spinlock.h> Geert Uytterhoeven
2019-05-13 12:04 ` Simon Horman
2019-04-29 15:20 ` [PATCH 2/5] irqchip/renesas-irqc: Remove devm_kzalloc()/ioremap_nocache() error printing Geert Uytterhoeven
2019-04-30 8:12 ` Sergei Shtylyov
2019-04-30 11:59 ` Geert Uytterhoeven
2019-05-13 12:04 ` Simon Horman
2019-04-29 15:20 ` Geert Uytterhoeven [this message]
2019-05-13 12:15 ` [PATCH 3/5] irqchip/renesas-irqc: Add helper variable dev = &pdev->dev Simon Horman
2019-04-29 15:20 ` [PATCH 4/5] irqchip/renesas-irqc: Replace irqc_priv.pdev by irqc_priv.dev Geert Uytterhoeven
2019-05-13 12:15 ` Simon Horman
2019-04-29 15:20 ` [PATCH 5/5] irqchip/renesas-irqc: Convert to managed initializations Geert Uytterhoeven
2019-05-13 12:15 ` Simon Horman
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=20190429152006.22593-4-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=tglx@linutronix.de \
/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).