Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e86d766 authored by Nicolae Rosia's avatar Nicolae Rosia Committed by David S. Miller
Browse files

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: default avatarNicolae Rosia <nicolae.rosia@certsign.ro>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08bfc9cb

drivers/net/ethernet/cadence/macb.c

+5 −4
Original line number Diff line number Diff line
@@ -2205,7 +2205,7 @@ static void macb_probe_queues(void __iomem *mem, 
			(*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 resource *regs;
@@ -2444,7 +2444,7 @@ static int __init macb_probe(struct platform_device *pdev) 
	return err;

}



static int __exit macb_remove(struct platform_device *pdev)

static int macb_remove(struct platform_device *pdev)

{

	struct net_device *dev;

	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 struct platform_driver macb_driver = {

	.remove		= __exit_p(macb_remove),

	.probe		= macb_probe,

	.remove		= macb_remove,

	.driver		= {

		.name		= "macb",

		.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_DESCRIPTION("Cadence MACB/GEM Ethernet driver");