From: Rafał Miłecki <rafal@milecki.pl>
Date: Fri, 3 Mar 2017 10:33:30 +0000 (+0100)
Subject: bcma: drop unneeded check for CONFIG_OF_IRQ
X-Git-Tag: v4.12-rc1~108^2~193^2~41
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=48d1977655341f1e004beb81eda8e93316c55963;p=linux.git

bcma: drop unneeded check for CONFIG_OF_IRQ

We already have the same check in bcma_of_get_irq which really calls
symbols available with CONFIG_OF_IRQ only. It appears this duplicated
check was accidentally added in commit c58d900cc96a ("bcma: fix building
without OF_IRQ"). The rest of code in bcma_of_fill_device should work
fine without CONFIG_OF_IRQ.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 12da68ec48ba..8957137fc368 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -201,9 +201,6 @@ static void bcma_of_fill_device(struct device *parent,
 {
 	struct device_node *node;
 
-	if (!IS_ENABLED(CONFIG_OF_IRQ))
-		return;
-
 	node = bcma_of_find_child_device(parent, core);
 	if (node)
 		core->dev.of_node = node;