p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: macb: allow deffered probe of the driver 

The driver is trying to acquire clocks which maybe
are not available yet. Allow the driver to request
deffered probe by providing a probe function and
registering it with module_platform_driver. [1]
This patch is based on 3.19-rc5.

[1] https://lkml.org/lkml/2013/9/23/118

Signed-off-by: Nicolae Rosia <nicolae.rosia@certsign.ro>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolae Rosia 2015-01-22 17:31:05 +00:00 committed by David S. Miller
parent 08bfc9cb76
commit 9e86d7667c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/cadence/macb.c
View File

@ -2205,7 +2205,7 @@ static void macb_probe_queues(void __iomem *mem,
(*num_queues)++; (*num_queues)++;
} }
static int __init macb_probe(struct platform_device *pdev) static int macb_probe(struct platform_device *pdev)
{ {
struct macb_platform_data *pdata; struct macb_platform_data *pdata;
struct resource *regs; struct resource *regs;
@ -2444,7 +2444,7 @@ static int __init macb_probe(struct platform_device *pdev)
return err; return err;
} }
static int __exit macb_remove(struct platform_device *pdev) static int macb_remove(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct macb *bp; struct macb *bp;
@ -2507,7 +2507,8 @@ static int macb_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume); static SIMPLE_DEV_PM_OPS(macb_pm_ops, macb_suspend, macb_resume);
static struct platform_driver macb_driver = { static struct platform_driver macb_driver = {
.remove = __exit_p(macb_remove), .probe = macb_probe,
.remove = macb_remove,
.driver = { .driver = {
.name = "macb", .name = "macb",
.of_match_table = of_match_ptr(macb_dt_ids), .of_match_table = of_match_ptr(macb_dt_ids),
@ -2515,7 +2516,7 @@ static struct platform_driver macb_driver = {
}, },
}; };
module_platform_driver_probe(macb_driver, macb_probe); module_platform_driver(macb_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver"); MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver");