diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-16 10:45:42 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-16 10:45:44 -0800 |
| commit | c7ce73eb018566222542adfb21f18961d0009286 (patch) | |
| tree | 4fa522527a0c8c1e77613939ff661d50e77b2ce8 /drivers/memory | |
| parent | e87f61892c6e7f44fc07082f605249afc52e1948 (diff) | |
| parent | 34efc83727c85430a763f7119daba56ccdc80608 (diff) | |
| download | linux-c7ce73eb018566222542adfb21f18961d0009286.tar.bz2 | |
Merge tag 'mvebu-drivers-5.6-1' of git://git.infradead.org/linux-mvebu into arm/drivers
mvebu drivers for 5.6 (part 1)
- Various cleanup on the following drivers:
- Turris Mox rWTM firmware
- Moxtet bus
- Armada 37xx rWTM mailbox
- Marvell EBU Device Bus
* tag 'mvebu-drivers-5.6-1' of git://git.infradead.org/linux-mvebu:
mailbox: armada-37xx-rwtm: convert to devm_platform_ioremap_resource
memory: mvebu-devbus: convert to devm_platform_ioremap_resource
bus: moxtet: declare moxtet_bus_type as static
firmware: turris-mox-rwtm: small white space cleanup
Link: https://lore.kernel.org/r/877e1x3nxc.fsf@FE-laptop
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/mvebu-devbus.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c index 095f8a3b2cfc..886aea587276 100644 --- a/drivers/memory/mvebu-devbus.c +++ b/drivers/memory/mvebu-devbus.c @@ -267,7 +267,6 @@ static int mvebu_devbus_probe(struct platform_device *pdev) struct devbus_read_params r; struct devbus_write_params w; struct devbus *devbus; - struct resource *res; struct clk *clk; unsigned long rate; int err; @@ -277,8 +276,7 @@ static int mvebu_devbus_probe(struct platform_device *pdev) return -ENOMEM; devbus->dev = dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - devbus->base = devm_ioremap_resource(&pdev->dev, res); + devbus->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(devbus->base)) return PTR_ERR(devbus->base); |