From: Marc Zyngier <maz@kernel.org>
To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <brgl@bgdev.pl>,
Matthias Brugger <matthias.bgg@gmail.com>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
Kevin Hilman <khilman@kernel.org>,
Tony Lindgren <tony@atomide.com>,
Thomas Gleixner <tglx@linutronix.de>,
Vladimir Zapolskiy <vz@mleia.com>, Andrew Lunn <andrew@lunn.ch>,
Gregory Clement <gregory.clement@bootlin.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Emil Renner Berthing <kernel@esmil.dk>,
kernel-team@android.com
Subject: [PATCH 10/10] pinctrl: starfive: Switch to dynamic chip name output
Date: Wed, 9 Feb 2022 16:26:07 +0000 [thread overview]
Message-ID: <20220209162607.1118325-11-maz@kernel.org> (raw)
In-Reply-To: <20220209162607.1118325-1-maz@kernel.org>
Instead of overloading the name field, use the relevant callback to
output the device name.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/pinctrl/pinctrl-starfive.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-starfive.c b/drivers/pinctrl/pinctrl-starfive.c
index 5be9866c2b3c..f29d9ccf858b 100644
--- a/drivers/pinctrl/pinctrl-starfive.c
+++ b/drivers/pinctrl/pinctrl-starfive.c
@@ -15,6 +15,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
+#include <linux/seq_file.h>
#include <linux/spinlock.h>
#include <linux/pinctrl/pinctrl.h>
@@ -1163,12 +1164,20 @@ static int starfive_irq_set_type(struct irq_data *d, unsigned int trigger)
return 0;
}
+static void starfive_irq_print_chip(struct irq_data *d, struct seq_file *p)
+{
+ struct starfive_pinctrl *sfp = starfive_from_irq_data(d);
+
+ seq_printf(p, sfp->gc.label);
+}
+
static struct irq_chip starfive_irq_chip = {
.irq_ack = starfive_irq_ack,
.irq_mask = starfive_irq_mask,
.irq_mask_ack = starfive_irq_mask_ack,
.irq_unmask = starfive_irq_unmask,
.irq_set_type = starfive_irq_set_type,
+ .irq_print_chip = starfive_irq_print_chip,
.flags = IRQCHIP_SET_TYPE_MASKED,
};
@@ -1307,8 +1316,6 @@ static int starfive_probe(struct platform_device *pdev)
sfp->gc.base = -1;
sfp->gc.ngpio = NR_GPIOS;
- starfive_irq_chip.name = sfp->gc.label;
-
sfp->gc.irq.chip = &starfive_irq_chip;
sfp->gc.irq.parent_handler = starfive_gpio_irq_handler;
sfp->gc.irq.num_parents = 1;
--
2.30.2
next prev parent reply other threads:[~2022-02-09 16:49 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 16:25 [PATCH 00/10] irqchip: Prevent drivers abusing irq_chip::name Marc Zyngier
2022-02-09 16:25 ` [PATCH 01/10] irqdomain: Let irq_domain_set_{info,hwirq_and_chip} take a const irq_chip Marc Zyngier
2022-02-09 16:25 ` [PATCH 02/10] genirq: Allow irq_chip registration functions to " Marc Zyngier
2022-02-09 16:26 ` [PATCH 03/10] irqchip/gic: Switch to dynamic chip name output Marc Zyngier
2022-02-10 23:38 ` Linus Walleij
2022-02-11 9:08 ` Marc Zyngier
2022-02-09 16:26 ` [PATCH 04/10] irqchip/lpc32xx: " Marc Zyngier
2022-02-09 16:26 ` [PATCH 05/10] irqchip/mvebu-pic: " Marc Zyngier
2022-02-14 14:48 ` Gregory CLEMENT
2022-02-09 16:26 ` [PATCH 06/10] irqchip/ts4800: " Marc Zyngier
2022-02-09 16:26 ` [PATCH 07/10] irqchip/versatile-fpga: " Marc Zyngier
2022-02-10 23:29 ` Linus Walleij
2022-02-09 16:26 ` [PATCH 08/10] gpio: mt7621: " Marc Zyngier
2022-02-09 16:26 ` [PATCH 09/10] gpio: omap: " Marc Zyngier
2022-02-09 16:26 ` Marc Zyngier [this message]
2022-02-09 23:30 ` [PATCH 10/10] pinctrl: starfive: " Emil Renner Berthing
2022-02-10 9:06 ` Marc Zyngier
2022-02-10 12:59 ` Emil Renner Berthing
2022-02-10 13:32 ` Marc Zyngier
2022-02-10 13:44 ` Emil Renner Berthing
2022-02-10 13:50 ` Marc Zyngier
2022-02-10 14:14 ` Emil Renner Berthing
2022-02-10 14:22 ` Marc Zyngier, Linus Walleij
2022-02-10 14:34 ` Marc Zyngier
2022-02-10 14:46 ` Emil Renner Berthing
2022-02-11 0:18 ` Linus Walleij
2022-02-11 0:15 ` Linus Walleij
2022-02-11 9:20 ` Marc Zyngier
2022-02-10 23:41 ` [PATCH 00/10] irqchip: Prevent drivers abusing irq_chip::name Linus Walleij
2022-02-15 12:13 ` Marc Zyngier
2022-02-15 15:37 ` Andy Shevchenko
2022-02-19 1:03 ` Linus Walleij
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=20220209162607.1118325-11-maz@kernel.org \
--to=maz@kernel.org \
--cc=andrew@lunn.ch \
--cc=brgl@bgdev.pl \
--cc=gregory.clement@bootlin.com \
--cc=grygorii.strashko@ti.com \
--cc=kernel-team@android.com \
--cc=kernel@esmil.dk \
--cc=khilman@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=sebastian.hesselbarth@gmail.com \
--cc=ssantosh@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony@atomide.com \
--cc=vz@mleia.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).