Commit 56172ac1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hsi-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi 

Pull HSI update from Sebastian Reichel:

 - convert to platform remove callback returning void

* tag 'hsi-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: omap_ssi_port: Convert to platform remove callback returning void
  HSI: omap_ssi_core: Convert to platform remove callback returning void
parents 85d46148 c076486b

drivers/hsi/controllers/omap_ssi_core.c

+2 −4
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int ssi_probe(struct platform_device *pd) 
	return err;

}



static int ssi_remove(struct platform_device *pd)

static void ssi_remove(struct platform_device *pd)

{

	struct hsi_controller *ssi = platform_get_drvdata(pd);
@@ -561,8 +561,6 @@ static int ssi_remove(struct platform_device *pd) 
	platform_set_drvdata(pd, NULL);



	pm_runtime_disable(&pd->dev);



	return 0;

}



#ifdef CONFIG_PM
@@ -618,7 +616,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_of_match); 


static struct platform_driver ssi_pdriver = {

	.probe = ssi_probe,

	.remove	= ssi_remove,

	.remove_new = ssi_remove,

	.driver	= {

		.name	= "omap_ssi",

		.pm     = DEV_PM_OPS,

drivers/hsi/controllers/omap_ssi_port.c

+2 −4
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static int ssi_port_probe(struct platform_device *pd) 
	return err;

}



static int ssi_port_remove(struct platform_device *pd)

static void ssi_port_remove(struct platform_device *pd)

{

	struct hsi_port *port = platform_get_drvdata(pd);

	struct omap_ssi_port *omap_port = hsi_port_drvdata(port);
@@ -1251,8 +1251,6 @@ static int ssi_port_remove(struct platform_device *pd) 


	pm_runtime_dont_use_autosuspend(&pd->dev);

	pm_runtime_disable(&pd->dev);



	return 0;

}



static int ssi_restore_divisor(struct omap_ssi_port *omap_port)
@@ -1387,7 +1385,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_port_of_match); 


struct platform_driver ssi_port_pdriver = {

	.probe = ssi_port_probe,

	.remove	= ssi_port_remove,

	.remove_new = ssi_port_remove,

	.driver	= {

		.name	= "omap_ssi_port",

		.of_match_table = omap_ssi_port_of_match,