usb: musb: Drop unneeded resource copying

The platform device resources are copied by the driver core, so there is
no need for the caller to do it when creating a platform device. Just pass
the parent resources to the child device directly.

Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211215230756.2009115-2-robh@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 1c023c0091c4ba2edb9129af68196dc70b8a387e..e4e0195131da6a53fddf0838a1fcfd8c699bc9ab 100644 (file)
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -505,7 +505,6 @@ static struct of_dev_auxdata da8xx_auxdata_lookup[] = {
 
 static int da8xx_probe(struct platform_device *pdev)
 {
-       struct resource musb_resources[2];
        struct musb_hdrc_platform_data  *pdata = dev_get_platdata(&pdev->dev);
        struct da8xx_glue               *glue;
        struct platform_device_info     pinfo;
@@ -558,23 +557,10 @@ static int da8xx_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       memset(musb_resources, 0x00, sizeof(*musb_resources) *
-                       ARRAY_SIZE(musb_resources));
-
-       musb_resources[0].name = pdev->resource[0].name;
-       musb_resources[0].start = pdev->resource[0].start;
-       musb_resources[0].end = pdev->resource[0].end;
-       musb_resources[0].flags = pdev->resource[0].flags;
-
-       musb_resources[1].name = pdev->resource[1].name;
-       musb_resources[1].start = pdev->resource[1].start;
-       musb_resources[1].end = pdev->resource[1].end;
-       musb_resources[1].flags = pdev->resource[1].flags;
-
        pinfo = da8xx_dev_info;
        pinfo.parent = &pdev->dev;
-       pinfo.res = musb_resources;
-       pinfo.num_res = ARRAY_SIZE(musb_resources);
+       pinfo.res = pdev->resource;
+       pinfo.num_res = pdev->num_resources;
        pinfo.data = pdata;
        pinfo.size_data = sizeof(*pdata);
 

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index f086960fe2b5055e4cd4a8a8c3afa7667e336b1f..d2b7e613eb34f0df4cac9a5250016430fb64b62b 100644 (file)
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -301,7 +301,6 @@ static u64 omap2430_dmamask = DMA_BIT_MASK(32);
 
 static int omap2430_probe(struct platform_device *pdev)
 {
-       struct resource                 musb_resources[3];
        struct musb_hdrc_platform_data  *pdata = dev_get_platdata(&pdev->dev);
        struct omap_musb_board_data     *data;
        struct platform_device          *musb;
@@ -383,26 +382,7 @@ static int omap2430_probe(struct platform_device *pdev)
 
        INIT_WORK(&glue->omap_musb_mailbox_work, omap_musb_mailbox_work);
 
-       memset(musb_resources, 0x00, sizeof(*musb_resources) *
-                       ARRAY_SIZE(musb_resources));
-
-       musb_resources[0].name = pdev->resource[0].name;
-       musb_resources[0].start = pdev->resource[0].start;
-       musb_resources[0].end = pdev->resource[0].end;
-       musb_resources[0].flags = pdev->resource[0].flags;
-
-       musb_resources[1].name = pdev->resource[1].name;
-       musb_resources[1].start = pdev->resource[1].start;
-       musb_resources[1].end = pdev->resource[1].end;
-       musb_resources[1].flags = pdev->resource[1].flags;
-
-       musb_resources[2].name = pdev->resource[2].name;
-       musb_resources[2].start = pdev->resource[2].start;
-       musb_resources[2].end = pdev->resource[2].end;
-       musb_resources[2].flags = pdev->resource[2].flags;
-
-       ret = platform_device_add_resources(musb, musb_resources,
-                       ARRAY_SIZE(musb_resources));
+       ret = platform_device_add_resources(musb, pdev->resource, pdev->num_resources);
        if (ret) {
                dev_err(&pdev->dev, "failed to add resources\n");
                goto err2;

diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 73538d1d05247841d75d0308a3cb8c97fac3166b..9bce19b5ffd74f15f84b5613e634e02a45cf9d4b 100644 (file)
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -216,7 +216,6 @@ ux500_of_probe(struct platform_device *pdev, struct device_node *np)
 
 static int ux500_probe(struct platform_device *pdev)
 {
-       struct resource musb_resources[2];
        struct musb_hdrc_platform_data  *pdata = dev_get_platdata(&pdev->dev);
        struct device_node              *np = pdev->dev.of_node;
        struct platform_device          *musb;
@@ -273,21 +272,7 @@ static int ux500_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, glue);
 
-       memset(musb_resources, 0x00, sizeof(*musb_resources) *
-                       ARRAY_SIZE(musb_resources));
-
-       musb_resources[0].name = pdev->resource[0].name;
-       musb_resources[0].start = pdev->resource[0].start;
-       musb_resources[0].end = pdev->resource[0].end;
-       musb_resources[0].flags = pdev->resource[0].flags;
-
-       musb_resources[1].name = pdev->resource[1].name;
-       musb_resources[1].start = pdev->resource[1].start;
-       musb_resources[1].end = pdev->resource[1].end;
-       musb_resources[1].flags = pdev->resource[1].flags;
-
-       ret = platform_device_add_resources(musb, musb_resources,
-                       ARRAY_SIZE(musb_resources));
+       ret = platform_device_add_resources(musb, pdev->resource, pdev->num_resources);
        if (ret) {
                dev_err(&pdev->dev, "failed to add resources\n");
                goto err2;