Skip to content

Commit 9879c81

Browse files
robherringgregkh
authored andcommitted
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>
1 parent 4de5bd9 commit 9879c81

File tree

3 files changed

+4
-53
lines changed

3 files changed

+4
-53
lines changed

drivers/usb/musb/da8xx.c

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ static struct of_dev_auxdata da8xx_auxdata_lookup[] = {
505505

506506
static int da8xx_probe(struct platform_device *pdev)
507507
{
508-
struct resource musb_resources[2];
509508
struct musb_hdrc_platform_data *pdata = dev_get_platdata(&pdev->dev);
510509
struct da8xx_glue *glue;
511510
struct platform_device_info pinfo;
@@ -558,23 +557,10 @@ static int da8xx_probe(struct platform_device *pdev)
558557
if (ret)
559558
return ret;
560559

561-
memset(musb_resources, 0x00, sizeof(*musb_resources) *
562-
ARRAY_SIZE(musb_resources));
563-
564-
musb_resources[0].name = pdev->resource[0].name;
565-
musb_resources[0].start = pdev->resource[0].start;
566-
musb_resources[0].end = pdev->resource[0].end;
567-
musb_resources[0].flags = pdev->resource[0].flags;
568-
569-
musb_resources[1].name = pdev->resource[1].name;
570-
musb_resources[1].start = pdev->resource[1].start;
571-
musb_resources[1].end = pdev->resource[1].end;
572-
musb_resources[1].flags = pdev->resource[1].flags;
573-
574560
pinfo = da8xx_dev_info;
575561
pinfo.parent = &pdev->dev;
576-
pinfo.res = musb_resources;
577-
pinfo.num_res = ARRAY_SIZE(musb_resources);
562+
pinfo.res = pdev->resource;
563+
pinfo.num_res = pdev->num_resources;
578564
pinfo.data = pdata;
579565
pinfo.size_data = sizeof(*pdata);
580566

drivers/usb/musb/omap2430.c

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ static u64 omap2430_dmamask = DMA_BIT_MASK(32);
301301

302302
static int omap2430_probe(struct platform_device *pdev)
303303
{
304-
struct resource musb_resources[3];
305304
struct musb_hdrc_platform_data *pdata = dev_get_platdata(&pdev->dev);
306305
struct omap_musb_board_data *data;
307306
struct platform_device *musb;
@@ -383,26 +382,7 @@ static int omap2430_probe(struct platform_device *pdev)
383382

384383
INIT_WORK(&glue->omap_musb_mailbox_work, omap_musb_mailbox_work);
385384

386-
memset(musb_resources, 0x00, sizeof(*musb_resources) *
387-
ARRAY_SIZE(musb_resources));
388-
389-
musb_resources[0].name = pdev->resource[0].name;
390-
musb_resources[0].start = pdev->resource[0].start;
391-
musb_resources[0].end = pdev->resource[0].end;
392-
musb_resources[0].flags = pdev->resource[0].flags;
393-
394-
musb_resources[1].name = pdev->resource[1].name;
395-
musb_resources[1].start = pdev->resource[1].start;
396-
musb_resources[1].end = pdev->resource[1].end;
397-
musb_resources[1].flags = pdev->resource[1].flags;
398-
399-
musb_resources[2].name = pdev->resource[2].name;
400-
musb_resources[2].start = pdev->resource[2].start;
401-
musb_resources[2].end = pdev->resource[2].end;
402-
musb_resources[2].flags = pdev->resource[2].flags;
403-
404-
ret = platform_device_add_resources(musb, musb_resources,
405-
ARRAY_SIZE(musb_resources));
385+
ret = platform_device_add_resources(musb, pdev->resource, pdev->num_resources);
406386
if (ret) {
407387
dev_err(&pdev->dev, "failed to add resources\n");
408388
goto err2;

drivers/usb/musb/ux500.c

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ ux500_of_probe(struct platform_device *pdev, struct device_node *np)
216216

217217
static int ux500_probe(struct platform_device *pdev)
218218
{
219-
struct resource musb_resources[2];
220219
struct musb_hdrc_platform_data *pdata = dev_get_platdata(&pdev->dev);
221220
struct device_node *np = pdev->dev.of_node;
222221
struct platform_device *musb;
@@ -273,21 +272,7 @@ static int ux500_probe(struct platform_device *pdev)
273272

274273
platform_set_drvdata(pdev, glue);
275274

276-
memset(musb_resources, 0x00, sizeof(*musb_resources) *
277-
ARRAY_SIZE(musb_resources));
278-
279-
musb_resources[0].name = pdev->resource[0].name;
280-
musb_resources[0].start = pdev->resource[0].start;
281-
musb_resources[0].end = pdev->resource[0].end;
282-
musb_resources[0].flags = pdev->resource[0].flags;
283-
284-
musb_resources[1].name = pdev->resource[1].name;
285-
musb_resources[1].start = pdev->resource[1].start;
286-
musb_resources[1].end = pdev->resource[1].end;
287-
musb_resources[1].flags = pdev->resource[1].flags;
288-
289-
ret = platform_device_add_resources(musb, musb_resources,
290-
ARRAY_SIZE(musb_resources));
275+
ret = platform_device_add_resources(musb, pdev->resource, pdev->num_resources);
291276
if (ret) {
292277
dev_err(&pdev->dev, "failed to add resources\n");
293278
goto err2;

0 commit comments

Comments
 (0)