Commit 3aa12610 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.1-rc1' of... 

Merge tag 'icc-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-next

Grorgi writes:
  "interconnect changes for 6.1

   These are the interconnect changes for the 6.1-rc1 merge window, which
   this time are tiny. One is a series to convert the remove() callback of
   platform devices to return void instead of int. The other change is
   enabling modular support for a driver."

Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: Kconfig: Make INTERCONNECT_QCOM tristate
  interconnect: imx: Make imx_icc_unregister() return void
  interconnect: Make icc_provider_del() return void
  interconnect: sm8450: Ignore return value of icc_provider_del() in .remove()
  interconnect: osm-l3: Ignore return value of icc_provider_del() in .remove()
  interconnect: msm8974: Ignore return value of icc_provider_del() in .remove()
  interconnect: icc-rpmh: Ignore return value of icc_provider_del() in .remove()
  interconnect: icc-rpm: Ignore return value of icc_provider_del() in .remove()
  interconnect: imx: Ignore return value of icc_provider_del() in .remove()
parents 0f65caa9 7360d55b

drivers/interconnect/core.c

+3 −7
Original line number Diff line number Diff line
@@ -1057,29 +1057,25 @@ EXPORT_SYMBOL_GPL(icc_provider_add); 
/**

 * icc_provider_del() - delete previously added interconnect provider

 * @provider: the interconnect provider that will be removed from topology

 *

 * Return: 0 on success, or an error code otherwise

 */

int icc_provider_del(struct icc_provider *provider)

void icc_provider_del(struct icc_provider *provider)

{

	mutex_lock(&icc_lock);

	if (provider->users) {

		pr_warn("interconnect provider still has %d users\n",

			provider->users);

		mutex_unlock(&icc_lock);

		return -EBUSY;

		return;

	}



	if (!list_empty(&provider->nodes)) {

		pr_warn("interconnect provider still has nodes\n");

		mutex_unlock(&icc_lock);

		return -EBUSY;

		return;

	}



	list_del(&provider->provider_list);

	mutex_unlock(&icc_lock);



	return 0;

}

EXPORT_SYMBOL_GPL(icc_provider_del);

drivers/interconnect/imx/imx.c

+2 −2
Original line number Diff line number Diff line
@@ -324,13 +324,13 @@ int imx_icc_register(struct platform_device *pdev, 
}

EXPORT_SYMBOL_GPL(imx_icc_register);



int imx_icc_unregister(struct platform_device *pdev)

void imx_icc_unregister(struct platform_device *pdev)

{

	struct imx_icc_provider *imx_provider = platform_get_drvdata(pdev);



	imx_icc_unregister_nodes(&imx_provider->provider);



	return icc_provider_del(&imx_provider->provider);

	icc_provider_del(&imx_provider->provider);

}

EXPORT_SYMBOL_GPL(imx_icc_unregister);

drivers/interconnect/imx/imx.h

+1 −1
Original line number Diff line number Diff line
@@ -103,6 +103,6 @@ int imx_icc_register(struct platform_device *pdev, 
		     struct imx_icc_node_desc *nodes,

		     int nodes_count,

		     struct imx_icc_noc_setting *noc_settings);

int imx_icc_unregister(struct platform_device *pdev);

void imx_icc_unregister(struct platform_device *pdev);



#endif /* __DRIVERS_INTERCONNECT_IMX_H */

drivers/interconnect/imx/imx8mm.c

+3 −1
Original line number Diff line number Diff line
@@ -88,7 +88,9 @@ static int imx8mm_icc_probe(struct platform_device *pdev) 


static int imx8mm_icc_remove(struct platform_device *pdev)

{

	return imx_icc_unregister(pdev);

	imx_icc_unregister(pdev);



	return 0;

}



static struct platform_driver imx8mm_icc_driver = {

drivers/interconnect/imx/imx8mn.c

+3 −1
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ static int imx8mn_icc_probe(struct platform_device *pdev) 


static int imx8mn_icc_remove(struct platform_device *pdev)

{

	return imx_icc_unregister(pdev);

	imx_icc_unregister(pdev);



	return 0;

}



static struct platform_driver imx8mn_icc_driver = {