Unverified Commit 89c83972 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.19/soc-signed' of... 

Merge tag 'omap-for-v5.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

Soc clean-up for omaps

Soc clean-up for omaps to add missing of_node_put() calls
and drop unused omap_device_register().

* tag 'omap-for-v5.19/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: drop hwmod-clock helper comment
  ARM: OMAP2+: drop omap_device_register() helper
  ARM: OMAP2+: add missing of_node_put before break and return

Link: https://lore.kernel.org/r/pull-1651061256-836848@atomide.com-3


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b2d229d4 df3eb1fe

arch/arm/mach-omap2/cm_common.c

+6 −2
Original line number Diff line number Diff line
@@ -320,8 +320,10 @@ int __init omap2_cm_base_init(void) 
		data = (struct omap_prcm_init_data *)match->data;



		ret = of_address_to_resource(np, 0, &res);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}



		if (data->index == TI_CLKM_CM)

			mem = &cm_base;
@@ -367,9 +369,11 @@ int __init omap_cm_init(void) 
			continue;



		ret = omap2_clk_provider_init(np, data->index, NULL, data->mem);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}

	}



	return 0;

}

arch/arm/mach-omap2/control.c

+14 −5
Original line number Diff line number Diff line
@@ -769,8 +769,10 @@ int __init omap2_control_base_init(void) 
		data = (struct control_init_data *)match->data;



		mem = of_iomap(np, 0);

		if (!mem)

		if (!mem) {

			of_node_put(np);

			return -ENOMEM;

		}



		if (data->index == TI_CLKM_CTRL) {

			omap2_ctrl_base = mem;
@@ -810,22 +812,24 @@ int __init omap_control_init(void) 
		if (scm_conf) {

			syscon = syscon_node_to_regmap(scm_conf);



			if (IS_ERR(syscon))

				return PTR_ERR(syscon);

			if (IS_ERR(syscon)) {

				ret = PTR_ERR(syscon);

				goto of_node_put;

			}



			if (of_get_child_by_name(scm_conf, "clocks")) {

				ret = omap2_clk_provider_init(scm_conf,

							      data->index,

							      syscon, NULL);

				if (ret)

					return ret;

					goto of_node_put;

			}

		} else {

			/* No scm_conf found, direct access */

			ret = omap2_clk_provider_init(np, data->index, NULL,

						      data->mem);

			if (ret)

				return ret;

				goto of_node_put;

		}

	}
@@ -836,6 +840,11 @@ int __init omap_control_init(void) 
	}



	return 0;



of_node_put:

	of_node_put(np);

	return ret;



}



/**

arch/arm/mach-omap2/omap_device.c

+0 −20
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, 
 * omap_device, this function adds an entry in the clkdev table of the

 * form <dev-id=dev_name, con-id=role> if it does not exist already.

 *

 * The function is called from inside omap_device_build_ss(), after

 * omap_device_register.

 *

 * This allows drivers to get a pointer to its optional clocks based on its role

 * by calling clk_get(<dev*>, <role>).

 * In the case of the main clock, a "fck" alias is used.
@@ -473,23 +470,6 @@ struct dev_pm_domain omap_device_pm_domain = { 
	}

};



/**

 * omap_device_register - register an omap_device with one omap_hwmod

 * @pdev: the platform device (omap_device) to register.

 *

 * Register the omap_device structure.  This currently just calls

 * platform_device_register() on the underlying platform_device.

 * Returns the return value of platform_device_register().

 */

int omap_device_register(struct platform_device *pdev)

{

	pr_debug("omap_device: %s: registering\n", pdev->name);



	dev_pm_domain_set(&pdev->dev, &omap_device_pm_domain);

	return platform_device_add(pdev);

}





/* Public functions for use by device drivers through struct platform_data */



/**

arch/arm/mach-omap2/omap_device.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ int omap_device_idle(struct platform_device *pdev); 
struct omap_device *omap_device_alloc(struct platform_device *pdev,

				      struct omap_hwmod **ohs, int oh_cnt);

void omap_device_delete(struct omap_device *od);

int omap_device_register(struct platform_device *pdev);



struct device *omap_device_get_by_hwmod_name(const char *oh_name);

arch/arm/mach-omap2/prm_common.c

+6 −2
Original line number Diff line number Diff line
@@ -752,8 +752,10 @@ int __init omap2_prm_base_init(void) 
		data = (struct omap_prcm_init_data *)match->data;



		ret = of_address_to_resource(np, 0, &res);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}



		data->mem = ioremap(res.start, resource_size(&res));
@@ -799,9 +801,11 @@ int __init omap_prcm_init(void) 
		data = match->data;



		ret = omap2_clk_provider_init(np, data->index, NULL, data->mem);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}

	}



	omap_cm_init();