bcma: keep a direct pointer to the struct device
Rafał Miłecki
maintainerPATCH 1/2 bcma: keep a direct pointer to the struct device
From: Rafał Miłecki <[email protected]>
Accessing struct device is pretty useful/common so having a direct pointer:
1) Simplifies some code
2) Makes bcma_bus_get_host_dev() unneeded
3) Allows further improvements like using dev_* printing helpers
--- drivers/bcma/bcma_private.h | 1 - drivers/bcma/driver_gpio.c | 2 +- drivers/bcma/host_pci.c | 2 ++ drivers/bcma/host_soc.c | 4 ++-- drivers/bcma/main.c | 45 +++++++++---------------------------- include/linux/bcma/bcma.h | 11 +++------ 6 files changed, 18 insertions(+), 47 deletions(-)
drivers/bcma/bcma_private.h +0 -1
@@ -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
@@ -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
@@ -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
@@ -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
81 lines not on this page · raw message
include/linux/bcma/bcma.h +3 -8
@@ -332,6 +332,8 @@ extern int bcma_arch_register_fallback_sprom( struct ssb_sprom *out));struct bcma_bus { +struct device *dev; +/* The MMIO area. */ void __iomem *mmio;
@@ -339,14 +341,7 @@ struct bcma_bus {enum bcma_hosttype hosttype;bool host_is_pcie2;/* Used for BCMA_HOSTTYPE_PCI only */ -union { -/* Pointer to the PCI bus (only for BCMA_HOSTTYPE_PCI) */ -struct pci_dev *host_pci; -/* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */ -struct sdio_func *host_sdio; -/* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */ -struct platform_device *host_pdev; - }; +struct pci_dev *host_pci;/* PCI bus pointer (BCMA_HOSTTYPE_PCI only) */ struct bcma_chipinfo chipinfo;
Signature · 1 line
2.20.1
Rafał Miłecki
maintainerPATCH 2/2 bcma: use dev_* printing functions
From: Rafał Miłecki <[email protected]>
It provides more meaningful messages.
--- drivers/bcma/bcma_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/bcma/bcma_private.h +4 -4
@@ -10,13 +10,13 @@#include <linux/delay.h> #define bcma_err (bus, fmt, ...) \ - pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__) + dev_err((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)#define bcma_warn (bus, fmt, ...) \ - pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__) + dev_warn((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)#define bcma_info (bus, fmt, ...) \ - pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__) + dev_info((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)#define bcma_debug (bus, fmt, ...) \ - pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__) + dev_dbg((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)struct bcma_bus ;
Signature · 1 line
2.20.1
Quoted 9 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
Accessing struct device is pretty useful/common so having a direct pointer:
1) Simplifies some code
2) Makesbcma_bus_get_host_dev()unneeded
3) Allows further improvements like using dev_* printing helpersSigned-off-by Rafał Miłecki <[email protected]>
2 patches applied to wireless-drivers-next.git, thanks.
5a1c18b761dd bcma: keep a direct pointer to the struct device 777bc4801a68 bcma: use dev_* printing functions
Signature · 3 lines
https://patchwork.kernel.org/patch/10746011/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches