diff mbox

[4.12] bcma: drop unneeded check for CONFIG_OF_IRQ

Message ID 20170303103330.4914-1-zajec5@gmail.com (mailing list archive)
State Accepted
Commit 48d1977655341f1e004beb81eda8e93316c55963
Delegated to: Kalle Valo
Headers show

Commit Message

Rafał Miłecki March 3, 2017, 10:33 a.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

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>
---
 drivers/bcma/main.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Arnd Bergmann March 3, 2017, 10:46 a.m. UTC | #1 
On Fri, Mar 3, 2017 at 11:33 AM, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
>
> 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>

Acked-by: Arnd Bergmann <arnd@arndb.de>
Kalle Valo March 20, 2017, 5:11 p.m. UTC | #2 
Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> 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>

Patch applied to wireless-drivers-next.git, thanks.

48d197765534 bcma: drop unneeded check for CONFIG_OF_IRQ
diff mbox

Patch

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 2da7fe1d20a7..e6986c7608f1 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;