diff mbox

[4.12,1/2] bcma: use helper function to set core dev's parent

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

Commit Message

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

A tiny code deduplication thanks to the bcma_bus_get_host_dev.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 drivers/bcma/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Kalle Valo March 20, 2017, 5:12 p.m. UTC | #1 
Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> A tiny code deduplication thanks to the bcma_bus_get_host_dev.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

2 patches applied to wireless-drivers-next.git, thanks.

5e48a4cd2ee9 bcma: use helper function to set core dev's parent
f825f6ed20e3 bcma: fill core OF info independently of bus type
diff mbox

Patch

diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 12da68ec48ba..4f88821c1b2a 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -242,17 +242,16 @@  void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
 	core->dev.release = bcma_release_core_dev;
 	core->dev.bus = &bcma_bus_type;
 	dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
+	core->dev.parent = bcma_bus_get_host_dev(bus);
 
 	switch (bus->hosttype) {
 	case BCMA_HOSTTYPE_PCI:
-		core->dev.parent = &bus->host_pci->dev;
 		core->dma_dev = &bus->host_pci->dev;
 		core->irq = bus->host_pci->irq;
 		break;
 	case BCMA_HOSTTYPE_SOC:
 		if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
 			core->dma_dev = &bus->host_pdev->dev;
-			core->dev.parent = &bus->host_pdev->dev;
 			if (core->dev.parent)
 				bcma_of_fill_device(core->dev.parent, core);
 		} else {