github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASPEED soc updates for 6.7

Browse Source 
* Move all drivers to .remove_new callback
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRz6FSYRMHvZ436fLaBQBa54y6+yAUCZSyLvQAKCRCBQBa54y6+
 yL//AQDDTVJcId8nt8gUWwL+yjGrokPt/+1SsqyCHGTy3SI6rwD5ARNtUlvkM+77
 ig820/TBubDkDhGpYPXobP4Su73DOgY=
 =e+lV
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUtpGEACgkQYKtH/8kJ
 UifTMQ//UkeWmRkxgbacP1dAw6UgiDbkcJweRKOnb/IiXVzepqKFdmiQ3zjFBMyO
 c9yH3jBNI5XcLZRYqrmaOs8zPiQpAd/o5bT98mp6CTjBxuq+UaRSCvFeUITOd9ek
 c4JO4oPDHYMnc5xGgqeZfvqFrijSSacLw96UQtqJgr4gz7aEdoySdGpTDTwCKThk
 knFMKbBTP4tL012Hy3v8szS1DiOylDFjzzjTFKSAM3HQCNS0ZGOE+cKbKowIyw8k
 GBWQVFK+Ky4L60RNa13YLn9V5Bzc6qo2vqGRBygdTAEa+X/BPPh3LGx5uer6X+NT
 7wo2bn4sV0LjjB6KVmKRJgrqY54KntXKr3ylkUW6I3D4NPgL2wcsK5HQlp2pk5+y
 ar5Sev8YR9MQqe1MRBYJzXpLIct+RUBhACAWxm1EbwLHbni96m0U7+Uqf8D9ZUlu
 yI+4nN1ueXmjC9hU4ZoFbWAYMVWDjPziFtYjr8CJAS5+IPcdp46JEswP7x6Qzyf4
 qfU5qou+K/vSb9BdeqQLPUMZfOg1o9fCmiVU4ZsIDAlO6iEOKll5POyEyQ17XeHh
 yHR19Ods9H81rPcVY/2UZorYYIaOF+GIJtORSnTwogKJrUBiqiE3f0Ck4QJtkOdn
 nowVrstvu3cr1hrbZXSRbn9bxseuWZKMlRa3NpndYYRLXsdbN9Y=
 =34BT
 -----END PGP SIGNATURE-----

Merge tag 'aspeed-6.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/drivers

ASPEED soc updates for 6.7

 * Move all drivers to .remove_new callback

* tag 'aspeed-6.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  soc/aspeed: Convert to platform remove callback returning void

Link: https://lore.kernel.org/r/CACPK8XcTx9bd7DkguFOZ4qCxk8MJWm-yeNMLGDCnO+wv7dwa1g@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-10-16 23:00:16 +02:00
commit 1780d27c7a
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/soc/aspeed/aspeed-lpc-ctrl.c
View File

@ -332,14 +332,12 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
return rc;
}
static int aspeed_lpc_ctrl_remove(struct platform_device *pdev)
static void aspeed_lpc_ctrl_remove(struct platform_device *pdev)
{
struct aspeed_lpc_ctrl *lpc_ctrl = dev_get_drvdata(&pdev->dev);
misc_deregister(&lpc_ctrl->miscdev);
clk_disable_unprepare(lpc_ctrl->clk);
return 0;
}
static const struct of_device_id aspeed_lpc_ctrl_match[] = {
@ -355,7 +353,7 @@ static struct platform_driver aspeed_lpc_ctrl_driver = {
.of_match_table = aspeed_lpc_ctrl_match,
},
.probe = aspeed_lpc_ctrl_probe,
.remove = aspeed_lpc_ctrl_remove,
.remove_new = aspeed_lpc_ctrl_remove,
};
module_platform_driver(aspeed_lpc_ctrl_driver);

6
drivers/soc/aspeed/aspeed-lpc-snoop.c
View File

@ -331,7 +331,7 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
return rc;
}
static int aspeed_lpc_snoop_remove(struct platform_device *pdev)
static void aspeed_lpc_snoop_remove(struct platform_device *pdev)
{
struct aspeed_lpc_snoop *lpc_snoop = dev_get_drvdata(&pdev->dev);
@ -340,8 +340,6 @@ static int aspeed_lpc_snoop_remove(struct platform_device *pdev)
aspeed_lpc_disable_snoop(lpc_snoop, 1);
clk_disable_unprepare(lpc_snoop->clk);
return 0;
}
static const struct aspeed_lpc_snoop_model_data ast2400_model_data = {
@ -368,7 +366,7 @@ static struct platform_driver aspeed_lpc_snoop_driver = {
.of_match_table = aspeed_lpc_snoop_match,
},
.probe = aspeed_lpc_snoop_probe,
.remove = aspeed_lpc_snoop_remove,
.remove_new = aspeed_lpc_snoop_remove,
};
module_platform_driver(aspeed_lpc_snoop_driver);

6
drivers/soc/aspeed/aspeed-p2a-ctrl.c
View File

@ -383,13 +383,11 @@ static int aspeed_p2a_ctrl_probe(struct platform_device *pdev)
return rc;
}
static int aspeed_p2a_ctrl_remove(struct platform_device *pdev)
static void aspeed_p2a_ctrl_remove(struct platform_device *pdev)
{
struct aspeed_p2a_ctrl *p2a_ctrl = dev_get_drvdata(&pdev->dev);
misc_deregister(&p2a_ctrl->miscdev);
return 0;
}
#define SCU2C_DRAM BIT(25)
@ -433,7 +431,7 @@ static struct platform_driver aspeed_p2a_ctrl_driver = {
.of_match_table = aspeed_p2a_ctrl_match,
},
.probe = aspeed_p2a_ctrl_probe,
.remove = aspeed_p2a_ctrl_remove,
.remove_new = aspeed_p2a_ctrl_remove,
};
module_platform_driver(aspeed_p2a_ctrl_driver);

6
drivers/soc/aspeed/aspeed-uart-routing.c
View File

@ -565,14 +565,12 @@ static int aspeed_uart_routing_probe(struct platform_device *pdev)
return 0;
}
static int aspeed_uart_routing_remove(struct platform_device *pdev)
static void aspeed_uart_routing_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct aspeed_uart_routing *uart_routing = platform_get_drvdata(pdev);
sysfs_remove_group(&dev->kobj, uart_routing->attr_grp);
return 0;
}
static const struct of_device_id aspeed_uart_routing_table[] = {
@ -591,7 +589,7 @@ static struct platform_driver aspeed_uart_routing_driver = {
.of_match_table = aspeed_uart_routing_table,
},
.probe = aspeed_uart_routing_probe,
.remove = aspeed_uart_routing_remove,
.remove_new = aspeed_uart_routing_remove,
};
module_platform_driver(aspeed_uart_routing_driver);