Commit 9879c81b authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

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: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211215230756.2009115-2-robh@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4de5bd9a

drivers/usb/musb/da8xx.c

+2 −16
Original line number Diff line number Diff line
@@ -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);

drivers/usb/musb/omap2430.c

+1 −21
Original line number Diff line number Diff line
@@ -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;

drivers/usb/musb/ux500.c

+1 −16
Original line number Diff line number Diff line
@@ -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;