[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <481173F9.2040104@garzik.org>
Date: Fri, 25 Apr 2008 02:02:33 -0400
From: Jeff Garzik <jeff@...zik.org>
To: David Brownell <david-b@...bell.net>
CC: netdev@...r.kernel.org, nico@....org
Subject: Re: [RESEND/UPDATED patch 2.6.25] smc91x section fix
David Brownell wrote:
> From: David Brownell <dbrownell@...rs.sourceforge.net>
>
> Section fixup:
>
> WARNING: drivers/net/built-in.o(.text+0x1a2c): Section mismatch
> in reference from the function smc_drv_probe()
> to the function .init.text:smc_probe()
> The function smc_drv_probe() references
> the function __init smc_probe().
> This is often because smc_drv_probe lacks a __init
> annotation or the annotation of smc_probe is wrong.
>
> Also switch to platform_driver_probe(), and mark exit code as such.
> Total footprint shrinkage is about 2KB on ARMv5.
>
> Note that few platform devices are actually hotpluggable, and these
> smc devices are evidently not exceptions to that rule ... else there
> would have been oopsing in this driver from the smc_probe() problem.
>
> Signed-off-by: David Brownell <dbrownell@...rs.sourceforge.net>
> ---
> Changes since earlier version: use platform_driver_probe(), add
> the __exit annotations, not how we can know this driver doesn't
> need to use hotplug-supporting "__devinit" annotations.
>
> drivers/net/smc91x.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> --- g26.orig/drivers/net/smc91x.c 2008-04-18 19:13:57.000000000 -0700
> +++ g26/drivers/net/smc91x.c 2008-04-18 19:15:57.000000000 -0700
> @@ -2097,7 +2097,8 @@ static inline void smc_request_datacs(st
> }
> }
>
> -static void smc_release_datacs(struct platform_device *pdev, struct net_device *ndev)
> +static void __exit smc_release_datacs(struct platform_device *pdev,
> + struct net_device *ndev)
> {
> if (SMC_CAN_USE_DATACS) {
> struct smc_local *lp = netdev_priv(ndev);
> @@ -2124,7 +2125,7 @@ static void smc_release_datacs(struct pl
> * 0 --> there is a device
> * anything else, error
> */
> -static int smc_drv_probe(struct platform_device *pdev)
> +static int __init smc_drv_probe(struct platform_device *pdev)
> {
> struct net_device *ndev;
> struct resource *res, *ires;
> @@ -2214,7 +2215,7 @@ static int smc_drv_probe(struct platform
> return ret;
> }
>
> -static int smc_drv_remove(struct platform_device *pdev)
> +static int __exit smc_drv_remove(struct platform_device *pdev)
> {
> struct net_device *ndev = platform_get_drvdata(pdev);
> struct smc_local *lp = netdev_priv(ndev);
> @@ -2278,8 +2279,7 @@ static int smc_drv_resume(struct platfor
> }
>
> static struct platform_driver smc_driver = {
> - .probe = smc_drv_probe,
> - .remove = smc_drv_remove,
> + .remove = __exit_p(smc_drv_remove),
> .suspend = smc_drv_suspend,
> .resume = smc_drv_resume,
> .driver = {
> @@ -2299,7 +2299,7 @@ static int __init smc_init(void)
> #endif
> #endif
>
> - return platform_driver_register(&smc_driver);
> + return platform_driver_probe(&smc_driver, smc_drv_probe);
> }
>
> static void __exit smc_cleanup(void)
> --
applied
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists