there's no need to use platform_driver_probe() here. Signed-off-by: Felipe Balbi <balbi@xxxxxx> --- drivers/cbus/retu.c | 9 +++++---- drivers/cbus/tahvo.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c index 444a21e..35bcb50 100644 --- a/drivers/cbus/retu.c +++ b/drivers/cbus/retu.c @@ -427,7 +427,7 @@ static int retu_allocate_children(struct device *parent, int irq_base) * Probe for the Retu ASIC and allocate memory * for its device-struct if found */ -static int __init retu_probe(struct platform_device *pdev) +static int __devinit retu_probe(struct platform_device *pdev) { struct retu *retu; struct cbus_retu_platform_data *pdata = pdev->dev.platform_data; @@ -507,7 +507,7 @@ err0: return ret; } -static int __exit retu_remove(struct platform_device *pdev) +static int __devexit retu_remove(struct platform_device *pdev) { struct retu *retu = platform_get_drvdata(pdev); @@ -523,7 +523,8 @@ static int __exit retu_remove(struct platform_device *pdev) } static struct platform_driver retu_driver = { - .remove = __exit_p(retu_remove), + .probe = retu_probe, + .remove = __devexit_p(retu_remove), .driver = { .name = "retu", }, @@ -531,7 +532,7 @@ static struct platform_driver retu_driver = { static int __init retu_init(void) { - return platform_driver_probe(&retu_driver, retu_probe); + return platform_driver_register(&retu_driver); } subsys_initcall(retu_init); diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c index c16e27d7..6119d19 100644 --- a/drivers/cbus/tahvo.c +++ b/drivers/cbus/tahvo.c @@ -396,6 +396,7 @@ static int __devexit tahvo_remove(struct platform_device *pdev) } static struct platform_driver tahvo_driver = { + .probe = tahvo_probe, .remove = __devexit_p(tahvo_remove), .driver = { .name = "tahvo", @@ -404,7 +405,7 @@ static struct platform_driver tahvo_driver = { static int __init tahvo_init(void) { - return platform_driver_probe(&tahvo_driver, tahvo_probe); + return platform_driver_register(&tahvo_driver); } subsys_initcall(tahvo_init); -- 1.7.6.396.ge0613 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html