korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 20:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

HSI changes for the 6.10 series

Browse Source 
* convert to platform remove callback returning void
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmZHcOoACgkQ2O7X88g7
 +ppWgQ/+J93XwUCBPclP4pSw1Q3dABzz2h1ivhCFw/w74LI6DzxQd1cMazwoMBrr
 /xw59Lf/QmcpsPoLCedlFHQIgBJkAuze4OW1Ycky7UYd0HdbZ98n9JXT2kM5gaHU
 /IbIt/qF0R5Occ0wqxN/xwlCVhp3MpUDwAZyjkjpzuY2a/t602N25FetFdN8UfwA
 xsG++AlQD8omr4iA53PRNeEBX8Hd2xMC3rWcfuVqa9Inzugcu9NQNFXK6fbcW5vc
 SU3EJYb3cz/gUJGz556KtRn9Cs1FL94/BoV0Pv48/rreKju/LCOFpzdGA3ruxxnH
 v7uVH2rOwxiQit1C/q7HoVxfrJ7uUiuDDzXnsSa2brtSTlj6k/QoAVy9ut87jPyQ
 qMRYKxCsn73lfsIpz/KSOZdqE4m9Q9gLBNysjFY5kaBclWW+zL4mmwNZH/u78tbx
 7vaRMIkVOlbSkKR5hB2J5BMIaMVXyKbvAGpssWk4CGFlns2O2u62jgysjPzadMM3
 UcIhIAnF67r8dyh1p+PDZqDICGeWm4kLaW5u3Ux0bPRWvSmyiRMkzj17cD4W7qvD
 pWaot7pgIQk28EQX4i5PrKvvn2tQnrDdF3i6FhoN/NuV0YBtnUs165iNHGGjTQmi
 qq/oP7k6myaLAtUaxJE+tZJFIN0qVRt/biB4BCBI/jDDppeLl5Q=
 =brgb
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-05-18 12:58:22 -07:00
commit 56172ac102
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hsi/controllers/omap_ssi_core.c
View File

@ -547,7 +547,7 @@ out1:
return err; 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); 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); platform_set_drvdata(pd, NULL);
pm_runtime_disable(&pd->dev); pm_runtime_disable(&pd->dev);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -618,7 +616,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_of_match);
static struct platform_driver ssi_pdriver = { static struct platform_driver ssi_pdriver = {
.probe = ssi_probe, .probe = ssi_probe,
.remove = ssi_remove, .remove_new = ssi_remove,
.driver = { .driver = {
.name = "omap_ssi", .name = "omap_ssi",
.pm = DEV_PM_OPS, .pm = DEV_PM_OPS,

6
drivers/hsi/controllers/omap_ssi_port.c
View File

@ -1224,7 +1224,7 @@ error:
return err; 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 hsi_port *port = platform_get_drvdata(pd);
struct omap_ssi_port *omap_port = hsi_port_drvdata(port); 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_dont_use_autosuspend(&pd->dev);
pm_runtime_disable(&pd->dev); pm_runtime_disable(&pd->dev);
return 0;
} }
static int ssi_restore_divisor(struct omap_ssi_port *omap_port) 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 = { struct platform_driver ssi_port_pdriver = {
.probe = ssi_port_probe, .probe = ssi_port_probe,
.remove = ssi_port_remove, .remove_new = ssi_port_remove,
.driver = { .driver = {
.name = "omap_ssi_port", .name = "omap_ssi_port",
.of_match_table = omap_ssi_port_of_match, .of_match_table = omap_ssi_port_of_match,