diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 15:54:33 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 15:54:35 +0300 |
| commit | 3ac02aa53d602154620de33bac87f4922e85b828 (patch) | |
| tree | bb8aea68570ab76cba867d3d49229e0f8bb4e638 /drivers/bus | |
| parent | 126c6da71fc8672820b7884eb6e53352e0733ae1 (diff) | |
| parent | c3fbced9af885a6f217fd95509a613d6590916ce (diff) | |
| download | linux-3ac02aa53d602154620de33bac87f4922e85b828.tar.xz | |
Merge tag 'arm-soc/for-6.4/drivers' of https://github.com/Broadcom/stblinux into soc/drivers
This pull request contains Broadcom SoCs drivers changes for 6.4, please
pull the following:
- Zhaoyang fixes an of_iomap() leak in the STB BIU driver
- Florian removes the bare-metal ARM suspend/resume code which has long
been replaced by the standard PSCI suspend/resume.
* tag 'arm-soc/for-6.4/drivers' of https://github.com/Broadcom/stblinux:
soc: bcm: brcmstb: biuctrl: fix of_iomap leak
soc: bcm: brcmstb: Remove bare-metal ARM suspend/resume code
kbuild, soc: bcm: bcm2835-power: remove MODULE_LICENSE in non-modules
kbuild, soc: bcm: raspberrypi-power: remove MODULE_LICENSE in non-modules
bus: brcmstb_gisb: Use devm_platform_get_and_ioremap_resource()
Link: https://lore.kernel.org/r/20230410232606.1917803-3-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/brcmstb_gisb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c index b0c3704777e9..b6dfe4340da2 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -401,12 +401,10 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev) struct device_node *dn = pdev->dev.of_node; struct brcmstb_gisb_arb_device *gdev; const struct of_device_id *of_id; - struct resource *r; int err, timeout_irq, tea_irq, bp_irq; unsigned int num_masters, j = 0; int i, first, last; - r = platform_get_resource(pdev, IORESOURCE_MEM, 0); timeout_irq = platform_get_irq(pdev, 0); tea_irq = platform_get_irq(pdev, 1); bp_irq = platform_get_irq(pdev, 2); @@ -418,7 +416,7 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev) mutex_init(&gdev->lock); INIT_LIST_HEAD(&gdev->next); - gdev->base = devm_ioremap_resource(&pdev->dev, r); + gdev->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); if (IS_ERR(gdev->base)) return PTR_ERR(gdev->base); |