Commit 063a9966 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

Revert "MIPS: OCTEON: use devm_platform_ioremap_resource" 



This reverts commit 0ee69c58.

Resource is still needed later in the code, so using
devm_platform_ioremap_resource is no win at all.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 26262396

arch/mips/cavium-octeon/octeon-usb.c

+9 −1
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ static int __init dwc3_octeon_device_init(void) 
	const char compat_node_name[] = "cavium,octeon-7130-usb-uctl";

	struct platform_device *pdev;

	struct device_node *node;

	struct resource *res;

	void __iomem *base;



	/*
@@ -515,13 +516,20 @@ static int __init dwc3_octeon_device_init(void) 
			if (!pdev)

				return -ENODEV;



			res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

			if (res == NULL) {

				put_device(&pdev->dev);

				dev_err(&pdev->dev, "No memory resources\n");

				return -ENXIO;

			}



			/*

			 * The code below maps in the registers necessary for

			 * setting up the clocks and reseting PHYs. We must

			 * release the resources so the dwc3 subsystem doesn't

			 * know the difference.

			 */

			base = devm_platform_ioremap_resource(pdev, 0);

			base = devm_ioremap_resource(&pdev->dev, res);

			if (IS_ERR(base)) {

				put_device(&pdev->dev);

				return PTR_ERR(base);