OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/probe' into spi-next

This commit is contained in:
Mark Brown 2013-10-25 09:51:36 +01:00
parent 7e0ae74090 1d82d0c268
commit 982d628743
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/spi/spi-au1550.c
View File

@ -985,6 +985,7 @@ static int au1550_spi_remove(struct platform_device *pdev)
MODULE_ALIAS("platform:au1550-spi"); MODULE_ALIAS("platform:au1550-spi");
static struct platform_driver au1550_spi_drv = { static struct platform_driver au1550_spi_drv = {
.probe = au1550_spi_probe,
.remove = au1550_spi_remove, .remove = au1550_spi_remove,
.driver = { .driver = {
.name = "au1550-spi", .name = "au1550-spi",
@ -1004,7 +1005,7 @@ static int __init au1550_spi_init(void)
printk(KERN_ERR "au1550-spi: cannot add memory" printk(KERN_ERR "au1550-spi: cannot add memory"
"dbdma device\n"); "dbdma device\n");
} }
return platform_driver_probe(&au1550_spi_drv, au1550_spi_probe); return platform_driver_register(&au1550_spi_drv);
} }
module_init(au1550_spi_init); module_init(au1550_spi_init);

5
drivers/spi/spi-omap-uwire.c
View File

@ -557,7 +557,8 @@ static struct platform_driver uwire_driver = {
.name = "omap_uwire", .name = "omap_uwire",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.remove = uwire_remove, .probe = uwire_probe,
.remove = uwire_remove,
// suspend ... unuse ck // suspend ... unuse ck
// resume ... use ck // resume ... use ck
}; };
@ -579,7 +580,7 @@ static int __init omap_uwire_init(void)
omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9); omap_writel(val | 0x00AAA000, OMAP7XX_IO_CONF_9);
} }
return platform_driver_probe(&uwire_driver, uwire_probe); return platform_driver_register(&uwire_driver);
} }
static void __exit omap_uwire_exit(void) static void __exit omap_uwire_exit(void)

3
drivers/spi/spi-txx9.c
View File

@ -438,6 +438,7 @@ static int txx9spi_remove(struct platform_device *dev)
MODULE_ALIAS("platform:spi_txx9"); MODULE_ALIAS("platform:spi_txx9");
static struct platform_driver txx9spi_driver = { static struct platform_driver txx9spi_driver = {
.probe = txx9spi_probe,
.remove = txx9spi_remove, .remove = txx9spi_remove,
.driver = { .driver = {
.name = "spi_txx9", .name = "spi_txx9",
@ -447,7 +448,7 @@ static struct platform_driver txx9spi_driver = {
static int __init txx9spi_init(void) static int __init txx9spi_init(void)
{ {
return platform_driver_probe(&txx9spi_driver, txx9spi_probe); return platform_driver_register(&txx9spi_driver);
} }
subsys_initcall(txx9spi_init); subsys_initcall(txx9spi_init);