[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <52407208.1060300@atmel.com>
Date: Mon, 23 Sep 2013 18:53:28 +0200
From: Nicolas Ferre <nicolas.ferre@...el.com>
To: Johan Hovold <jhovold@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
CC: Grant Likely <grant.likely@...aro.org>,
Mark Brown <broonie@...aro.org>,
<linux-kernel@...r.kernel.org>, <linux-mmc@...r.kernel.org>,
<linux-mtd@...ts.infradead.org>,
<linux-pcmcia@...ts.infradead.org>, <linux-usb@...r.kernel.org>,
<linux-fbdev@...r.kernel.org>,
"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>
Subject: Re: [PATCH 4/7] pcmcia: at91_cf: fix deferred probe from __init
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@...osoft.com>
> Cc: Nicolas Ferre <nicolas.ferre@...el.com>
Acked-by: Nicolas Ferre <nicolas.ferre@...el.com>
Thanks Johan.
> Signed-off-by: Johan Hovold <jhovold@...il.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");
>
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists