Commit 9064a1c7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge commit 'http://github.com/rogerq/linux gpmc-omap-v4.8-rc1' into next/drivers 



This is also going to be part of v4.8 and sent as a bugfix,
merging it here to avoid a small conflict against the other
gpmc changes.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7d3ef43f 23540d6e

drivers/memory/omap-gpmc.c

+7 −14
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) 
	return 0;

}



static int gpmc_probe_dt_children(struct platform_device *pdev)

static void gpmc_probe_dt_children(struct platform_device *pdev)

{

	int ret;

	struct device_node *child;
@@ -2198,11 +2198,11 @@ static int gpmc_probe_dt_children(struct platform_device *pdev) 
		else

			ret = gpmc_probe_generic_child(pdev, child);



		if (ret)

			return ret;

		if (ret) {

			dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",

				child->name, ret);

		}

	}



	return 0;

}

#else

static int gpmc_probe_dt(struct platform_device *pdev)
@@ -2210,9 +2210,8 @@ static int gpmc_probe_dt(struct platform_device *pdev) 
	return 0;

}



static int gpmc_probe_dt_children(struct platform_device *pdev)

static void gpmc_probe_dt_children(struct platform_device *pdev)

{

	return 0;

}

#endif /* CONFIG_OF */
@@ -2362,16 +2361,10 @@ static int gpmc_probe(struct platform_device *pdev) 
		goto gpio_init_failed;

	}



	rc = gpmc_probe_dt_children(pdev);

	if (rc < 0) {

		dev_err(gpmc->dev, "failed to probe DT children\n");

		goto dt_children_failed;

	}

	gpmc_probe_dt_children(pdev);



	return 0;



dt_children_failed:

	gpmc_free_irq(gpmc);

gpio_init_failed:

	gpmc_mem_exit();

	pm_runtime_put_sync(&pdev->dev);