bcma: keep a direct pointer to the struct device (5a1c18b7) · Commits · 戴 / test

drivers/bcma/bcma_private.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ int __init bcma_bus_early_register(struct bcma_bus *bus);
		int bcma_bus_suspend(struct bcma_bus *bus);
		int bcma_bus_resume(struct bcma_bus *bus);
		#endif
		struct device bcma_bus_get_host_dev(struct bcma_bus bus);

		/* scan.c */
		void bcma_detect_chip(struct bcma_bus *bus);

drivers/bcma/driver_gpio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
		chip->direction_input = bcma_gpio_direction_input;
		chip->direction_output = bcma_gpio_direction_output;
		chip->owner = THIS_MODULE;
		chip->parent = bcma_bus_get_host_dev(bus);
		chip->parent = bus->dev;
		#if IS_BUILTIN(CONFIG_OF)
		chip->of_node = cc->core->dev.of_node;
		#endif

drivers/bcma/host_pci.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,8 @@ static int bcma_host_pci_probe(struct pci_dev *dev,
		goto err_pci_release_regions;
		}

		bus->dev = &dev->dev;

		/* Map MMIO */
		err = -ENOMEM;
		bus->mmio = pci_iomap(dev, 0, ~0UL);

drivers/bcma/host_soc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -179,7 +179,6 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
		/* Host specific */
		bus->hosttype = BCMA_HOSTTYPE_SOC;
		bus->ops = &bcma_host_soc_ops;
		bus->host_pdev = NULL;

		/* Initialize struct, detect chip */
		bcma_init_bus(bus);
		@@ -213,6 +212,8 @@ static int bcma_host_soc_probe(struct platform_device *pdev)
		if (!bus)
		return -ENOMEM;

		bus->dev = dev;

		/* Map MMIO */
		bus->mmio = of_iomap(np, 0);
		if (!bus->mmio)
		@@ -221,7 +222,6 @@ static int bcma_host_soc_probe(struct platform_device *pdev)
		/* Host specific */
		bus->hosttype = BCMA_HOSTTYPE_SOC;
		bus->ops = &bcma_host_soc_ops;
		bus->host_pdev = pdev;

		/* Initialize struct, detect chip */
		bcma_init_bus(bus);

drivers/bcma/main.c

+10 −35

Original line number	Diff line number	Diff line
		@@ -223,8 +223,8 @@ unsigned int bcma_core_irq(struct bcma_device *core, int num)
		mips_irq = bcma_core_mips_irq(core);
		return mips_irq <= 4 ? mips_irq + 2 : 0;
		}
		if (bus->host_pdev)
		return bcma_of_get_irq(&bus->host_pdev->dev, core, num);
		if (bus->dev)
		return bcma_of_get_irq(bus->dev, core, num);
		return 0;
		case BCMA_HOSTTYPE_SDIO:
		return 0;
		@@ -239,18 +239,18 @@ 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);
		if (core->dev.parent)
		bcma_of_fill_device(core->dev.parent, core);
		core->dev.parent = bus->dev;
		if (bus->dev)
		bcma_of_fill_device(bus->dev, core);

		switch (bus->hosttype) {
		case BCMA_HOSTTYPE_PCI:
		core->dma_dev = &bus->host_pci->dev;
		core->dma_dev = bus->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;
		if (IS_ENABLED(CONFIG_OF) && bus->dev) {
		core->dma_dev = bus->dev;
		} else {
		core->dev.dma_mask = &core->dev.coherent_dma_mask;
		core->dma_dev = &core->dev;
		@@ -261,28 +261,6 @@ void bcma_prepare_core(struct bcma_bus bus, struct bcma_device core)
		}
		}

		struct device bcma_bus_get_host_dev(struct bcma_bus bus)
		{
		switch (bus->hosttype) {
		case BCMA_HOSTTYPE_PCI:
		if (bus->host_pci)
		return &bus->host_pci->dev;
		else
		return NULL;
		case BCMA_HOSTTYPE_SOC:
		if (bus->host_pdev)
		return &bus->host_pdev->dev;
		else
		return NULL;
		case BCMA_HOSTTYPE_SDIO:
		if (bus->host_sdio)
		return &bus->host_sdio->dev;
		else
		return NULL;
		}
		return NULL;
		}

		void bcma_init_bus(struct bcma_bus *bus)
		{
		mutex_lock(&bcma_buses_mutex);
		@@ -402,7 +380,6 @@ int bcma_bus_register(struct bcma_bus *bus)
		{
		int err;
		struct bcma_device *core;
		struct device *dev;

		/* Scan for devices (cores) */
		err = bcma_bus_scan(bus);
		@@ -425,10 +402,8 @@ int bcma_bus_register(struct bcma_bus *bus)
		bcma_core_pci_early_init(&bus->drv_pci[0]);
		}

		dev = bcma_bus_get_host_dev(bus);
		if (dev) {
		of_platform_default_populate(dev->of_node, NULL, dev);
		}
		if (bus->dev)
		of_platform_default_populate(bus->dev->of_node, NULL, bus->dev);

		/* Cores providing flash access go before SPROM init */
		list_for_each_entry(core, &bus->cores, list) {

Admin message