From: Javier Martinez Canillas Date: Thu, 14 Mar 2013 15:09:21 +0000 (+0100) Subject: ARM: OMAP2+: rename gpmc_probe_nor_child() to gpmc_probe_generic_child() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3af91cf7016bdfce9a6a0343ab942302e98e8f3d;p=openwrt%2Fstaging%2Fblogic.git ARM: OMAP2+: rename gpmc_probe_nor_child() to gpmc_probe_generic_child() The gpmc_probe_nor_child() function is used in the GPMC driver to configure the GPMC for a NOR child device node. But this function is quite generic and all the NOR specific configuration is made by the driver of the actual NOR flash memory used. Other Pseudo-SRAM devices such as ethernet controllers need a similar setup so by making this function generic it can be used for those too. Signed-off-by: Javier Martinez Canillas Signed-off-by: Jon Hunter --- diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index c6f0ef563817..8a1cafb2750e 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1429,14 +1429,14 @@ static int gpmc_probe_onenand_child(struct platform_device *pdev, #endif /** - * gpmc_probe_nor_child - configures the gpmc for a nor device + * gpmc_probe_generic_child - configures the gpmc for a child device * @pdev: pointer to gpmc platform device - * @child: pointer to device-tree node for nor device + * @child: pointer to device-tree node for child device * - * Allocates and configures a GPMC chip-select for a NOR flash device. + * Allocates and configures a GPMC chip-select for a child device. * Returns 0 on success and appropriate negative error code on failure. */ -static int gpmc_probe_nor_child(struct platform_device *pdev, +static int gpmc_probe_generic_child(struct platform_device *pdev, struct device_node *child) { struct gpmc_settings gpmc_s; @@ -1537,7 +1537,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) } for_each_node_by_name(child, "nor") { - ret = gpmc_probe_nor_child(pdev, child); + ret = gpmc_probe_generic_child(pdev, child); if (ret < 0) { of_node_put(child); return ret;