Commit eef38114 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

Merge branch 'reset/next' of git://git.pengutronix.de/pza/linux 

Philipp didn't come around to send a pull request in the last
development cycle. His next branch only contains patches converting
three platform drivers to stop using .remove().

They are merged with his consent to be able to change the prototype of
.remove() in the upcoming development cycle.

Link: https://lore.kernel.org/all/9b7e1a88a812f5c86ada75b094c95b9cf65891c3.camel@pengutronix.de/
parents 1613e604 6d89df61

drivers/reset/reset-meson-audio-arb.c

+2 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static const struct of_device_id meson_audio_arb_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, meson_audio_arb_of_match);



static int meson_audio_arb_remove(struct platform_device *pdev)

static void meson_audio_arb_remove(struct platform_device *pdev)

{

	struct meson_audio_arb_data *arb = platform_get_drvdata(pdev);
@@ -130,8 +130,6 @@ static int meson_audio_arb_remove(struct platform_device *pdev) 
	spin_unlock(&arb->lock);



	clk_disable_unprepare(arb->clk);



	return 0;

}



static int meson_audio_arb_probe(struct platform_device *pdev)
@@ -189,7 +187,7 @@ static int meson_audio_arb_probe(struct platform_device *pdev) 


static struct platform_driver meson_audio_arb_pdrv = {

	.probe = meson_audio_arb_probe,

	.remove = meson_audio_arb_remove,

	.remove_new = meson_audio_arb_remove,

	.driver = {

		.name = "meson-audio-arb-reset",

		.of_match_table = meson_audio_arb_of_match,

drivers/reset/reset-rzg2l-usbphy-ctrl.c

+2 −4
Original line number Diff line number Diff line
@@ -156,15 +156,13 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev) 
	return 0;

}



static int rzg2l_usbphy_ctrl_remove(struct platform_device *pdev)

static void rzg2l_usbphy_ctrl_remove(struct platform_device *pdev)

{

	struct rzg2l_usbphy_ctrl_priv *priv = dev_get_drvdata(&pdev->dev);



	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	reset_control_assert(priv->rstc);



	return 0;

}



static struct platform_driver rzg2l_usbphy_ctrl_driver = {
@@ -173,7 +171,7 @@ static struct platform_driver rzg2l_usbphy_ctrl_driver = { 
		.of_match_table	= rzg2l_usbphy_ctrl_match_table,

	},

	.probe	= rzg2l_usbphy_ctrl_probe,

	.remove	= rzg2l_usbphy_ctrl_remove,

	.remove_new = rzg2l_usbphy_ctrl_remove,

};

module_platform_driver(rzg2l_usbphy_ctrl_driver);

drivers/reset/reset-ti-sci.c

+2 −4
Original line number Diff line number Diff line
@@ -235,20 +235,18 @@ static int ti_sci_reset_probe(struct platform_device *pdev) 
	return reset_controller_register(&data->rcdev);

}



static int ti_sci_reset_remove(struct platform_device *pdev)

static void ti_sci_reset_remove(struct platform_device *pdev)

{

	struct ti_sci_reset_data *data = platform_get_drvdata(pdev);



	reset_controller_unregister(&data->rcdev);



	idr_destroy(&data->idr);



	return 0;

}



static struct platform_driver ti_sci_reset_driver = {

	.probe = ti_sci_reset_probe,

	.remove = ti_sci_reset_remove,

	.remove_new = ti_sci_reset_remove,

	.driver = {

		.name = "ti-sci-reset",

		.of_match_table = ti_sci_reset_of_match,