hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HSI: omap_ssi: built omap_ssi and omap_ssi_port into one module 

Merge omap_ssi and omap_ssi_port into one module. This
fixes problems with module cycle dependencies introduced
by future patches.

Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Sebastian Reichel 2016-04-30 03:24:09 +02:00
parent 2a57aba850
commit 0fae198988
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hsi/controllers/Kconfig
View File

@ -12,8 +12,3 @@ config OMAP_SSI
If you say Y here, you will enable the OMAP SSI hardware driver. If you say Y here, you will enable the OMAP SSI hardware driver.
If unsure, say N. If unsure, say N.
config OMAP_SSI_PORT
tristate
default m if OMAP_SSI=m
default y if OMAP_SSI=y

4
drivers/hsi/controllers/Makefile
View File

@ -2,5 +2,5 @@
# Makefile for HSI controllers drivers # Makefile for HSI controllers drivers
# #
obj-$(CONFIG_OMAP_SSI) += omap_ssi.o omap_ssi-objs += omap_ssi_core.o omap_ssi_port.o
obj-$(CONFIG_OMAP_SSI_PORT) += omap_ssi_port.o obj-$(CONFIG_OMAP_SSI) += omap_ssi.o

2
drivers/hsi/controllers/omap_ssi.h
View File

@ -164,4 +164,6 @@ struct omap_ssi_controller {
#endif #endif
}; };
extern struct platform_driver ssi_port_pdriver;
#endif /* __LINUX_HSI_OMAP_SSI_H__ */ #endif /* __LINUX_HSI_OMAP_SSI_H__ */

17
drivers/hsi/controllers/omap_ssi.c → drivers/hsi/controllers/omap_ssi_core.c
View File

@ -605,7 +605,22 @@ static struct platform_driver ssi_pdriver = {
}, },
}; };
module_platform_driver(ssi_pdriver); static int __init ssi_init(void) {
int ret;
ret = platform_driver_register(&ssi_pdriver);
if (ret)
return ret;
return platform_driver_register(&ssi_port_pdriver);
}
module_init(ssi_init);
static void __exit ssi_exit(void) {
platform_driver_unregister(&ssi_port_pdriver);
platform_driver_unregister(&ssi_pdriver);
}
module_exit(ssi_exit);
MODULE_ALIAS("platform:omap_ssi"); MODULE_ALIAS("platform:omap_ssi");
MODULE_AUTHOR("Carlos Chinea <carlos.chinea@nokia.com>"); MODULE_AUTHOR("Carlos Chinea <carlos.chinea@nokia.com>");

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

@ -1117,11 +1117,6 @@ static int ssi_port_probe(struct platform_device *pd)
dev_dbg(&pd->dev, "init ssi port...\n"); dev_dbg(&pd->dev, "init ssi port...\n");
if (!try_module_get(ssi->owner)) {
dev_err(&pd->dev, "could not increment parent module refcount\n");
return -ENODEV;
}
if (!ssi->port || !omap_ssi->port) { if (!ssi->port || !omap_ssi->port) {
dev_err(&pd->dev, "ssi controller not initialized!\n"); dev_err(&pd->dev, "ssi controller not initialized!\n");
err = -ENODEV; err = -ENODEV;
@ -1242,7 +1237,6 @@ static int ssi_port_remove(struct platform_device *pd)
omap_ssi->port[omap_port->port_id] = NULL; omap_ssi->port[omap_port->port_id] = NULL;
platform_set_drvdata(pd, NULL); platform_set_drvdata(pd, NULL);
module_put(ssi->owner);
pm_runtime_disable(&pd->dev); pm_runtime_disable(&pd->dev);
return 0; return 0;
@ -1369,7 +1363,7 @@ MODULE_DEVICE_TABLE(of, omap_ssi_port_of_match);
#define omap_ssi_port_of_match NULL #define omap_ssi_port_of_match NULL
#endif #endif
static 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 = ssi_port_remove,
.driver = { .driver = {
@ -1378,11 +1372,3 @@ static struct platform_driver ssi_port_pdriver = {
.pm = DEV_PM_OPS, .pm = DEV_PM_OPS,
}, },
}; };
module_platform_driver(ssi_port_pdriver);
MODULE_ALIAS("platform:omap_ssi_port");
MODULE_AUTHOR("Carlos Chinea <carlos.chinea@nokia.com>");
MODULE_AUTHOR("Sebastian Reichel <sre@kernel.org>");
MODULE_DESCRIPTION("Synchronous Serial Interface Port Driver");
MODULE_LICENSE("GPL v2");