| Message ID | 1379946452-25649-5-git-send-email-jhovold@gmail.com |
|---|---|
| State | New, archived |
| Headers | show |
On 23/09/2013 16:27, Johan Hovold : > Move probe out of __init section and don't use platform_driver_probe > which cannot be used with deferred probing. > > Since commit e9354576 ("gpiolib: Defer failed gpio requests by default") > this driver might return -EPROBE_DEFER if a gpio_request fails. > > Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Thanks Johan. > Signed-off-by: Johan Hovold <jhovold@gmail.com> > --- > drivers/pcmcia/at91_cf.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c > index b8f5acf..de24232 100644 > --- a/drivers/pcmcia/at91_cf.c > +++ b/drivers/pcmcia/at91_cf.c > @@ -245,7 +245,7 @@ static int at91_cf_dt_init(struct platform_device *pdev) > } > #endif > > -static int __init at91_cf_probe(struct platform_device *pdev) > +static int at91_cf_probe(struct platform_device *pdev) > { > struct at91_cf_socket *cf; > struct at91_cf_data *board = pdev->dev.platform_data; > @@ -354,7 +354,7 @@ fail0a: > return status; > } > > -static int __exit at91_cf_remove(struct platform_device *pdev) > +static int at91_cf_remove(struct platform_device *pdev) > { > struct at91_cf_socket *cf = platform_get_drvdata(pdev); > > @@ -404,14 +404,13 @@ static struct platform_driver at91_cf_driver = { > .owner = THIS_MODULE, > .of_match_table = of_match_ptr(at91_cf_dt_ids), > }, > - .remove = __exit_p(at91_cf_remove), > + .probe = at91_cf_probe, > + .remove = at91_cf_remove, > .suspend = at91_cf_suspend, > .resume = at91_cf_resume, > }; > > -/*--------------------------------------------------------------------------*/ > - > -module_platform_driver_probe(at91_cf_driver, at91_cf_probe); > +module_platform_driver(at91_cf_driver); > > MODULE_DESCRIPTION("AT91 Compact Flash Driver"); > MODULE_AUTHOR("David Brownell"); >
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index b8f5acf..de24232 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -245,7 +245,7 @@ static int at91_cf_dt_init(struct platform_device *pdev) } #endif -static int __init at91_cf_probe(struct platform_device *pdev) +static int at91_cf_probe(struct platform_device *pdev) { struct at91_cf_socket *cf; struct at91_cf_data *board = pdev->dev.platform_data; @@ -354,7 +354,7 @@ fail0a: return status; } -static int __exit at91_cf_remove(struct platform_device *pdev) +static int at91_cf_remove(struct platform_device *pdev) { struct at91_cf_socket *cf = platform_get_drvdata(pdev); @@ -404,14 +404,13 @@ static struct platform_driver at91_cf_driver = { .owner = THIS_MODULE, .of_match_table = of_match_ptr(at91_cf_dt_ids), }, - .remove = __exit_p(at91_cf_remove), + .probe = at91_cf_probe, + .remove = at91_cf_remove, .suspend = at91_cf_suspend, .resume = at91_cf_resume, }; -/*--------------------------------------------------------------------------*/ - -module_platform_driver_probe(at91_cf_driver, at91_cf_probe); +module_platform_driver(at91_cf_driver); MODULE_DESCRIPTION("AT91 Compact Flash Driver"); MODULE_AUTHOR("David Brownell");
Move probe out of __init section and don't use platform_driver_probe which cannot be used with deferred probing. Since commit e9354576 ("gpiolib: Defer failed gpio requests by default") this driver might return -EPROBE_DEFER if a gpio_request fails. Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Johan Hovold <jhovold@gmail.com> --- drivers/pcmcia/at91_cf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)