[2/2] genirq: Use is_fwnode_irqchip() directly

Message ID 1499315732-63950-2-git-send-email-guohanjun@huawei.com
State New
Headers show
Series
  • [1/2] genirq: Get the fwnode back for irqchips being probed via ACPI namespace
Related show

Commit Message

Hanjun Guo July 6, 2017, 4:35 a.m.
From: Hanjun Guo <hanjun.guo@linaro.org>


is_fwnode_irqchip() already check fwnode is NULL or not,
just use is_fwnode_irqchip() directly.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>

---
 kernel/irq/irqdomain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.7.12.4

Comments

Ethan Zhao July 6, 2017, 5:46 a.m. | #1
Hanjun,

    What branch is this patch for ? Check v4.12, failed to apply.

Thanks,
Ethan

On Thu, Jul 6, 2017 at 12:35 PM, Hanjun Guo <guohanjun@huawei.com> wrote:
> From: Hanjun Guo <hanjun.guo@linaro.org>

>

> is_fwnode_irqchip() already check fwnode is NULL or not,

> just use is_fwnode_irqchip() directly.

>

> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>

> ---

>  kernel/irq/irqdomain.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c

> index 1bc38fa..14a21a3 100644

> --- a/kernel/irq/irqdomain.c

> +++ b/kernel/irq/irqdomain.c

> @@ -137,7 +137,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,

>         if (WARN_ON(!domain))

>                 return NULL;

>

> -       if (fwnode && is_fwnode_irqchip(fwnode)) {

> +       if (is_fwnode_irqchip(fwnode)) {

>                 fwid = container_of(fwnode, struct irqchip_fwid, fwnode);

>

>                 switch (fwid->type) {

> --

> 1.7.12.4

>
Hanjun Guo July 6, 2017, 6:17 a.m. | #2
Hi Ethan,

On 2017/7/6 13:46, Ethan Zhao wrote:
> Hanjun,

>

>     What branch is this patch for ? Check v4.12, failed to apply.


I prepared patches based on master branch of linux-next git tree,
but they can be applied cleanly on top of latest Linus tree.

This patch set is for latest merged 4.13 material, not for 4.12 :)

Thanks
Hanjun

Patch

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 1bc38fa..14a21a3 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -137,7 +137,7 @@  struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,
 	if (WARN_ON(!domain))
 		return NULL;
 
-	if (fwnode && is_fwnode_irqchip(fwnode)) {
+	if (is_fwnode_irqchip(fwnode)) {
 		fwid = container_of(fwnode, struct irqchip_fwid, fwnode);
 
 		switch (fwid->type) {