Message ID | 1355915830-29481-1-git-send-email-sachin.kamat@linaro.org |
---|---|
State | Accepted |
Headers | show |
From: Sachin Kamat <sachin.kamat@linaro.org> Date: Wed, 19 Dec 2012 16:47:09 +0530 > This eliminates having an #ifdef returning NULL for the case > when OF is disabled. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Applied.
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 022b45b..a670d23 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c @@ -2386,8 +2386,6 @@ static const struct of_device_id smc91x_match[] = { {}, }; MODULE_DEVICE_TABLE(of, smc91x_match); -#else -#define smc91x_match NULL #endif static struct dev_pm_ops smc_drv_pm_ops = { @@ -2402,7 +2400,7 @@ static struct platform_driver smc_driver = { .name = CARDNAME, .owner = THIS_MODULE, .pm = &smc_drv_pm_ops, - .of_match_table = smc91x_match, + .of_match_table = of_match_ptr(smc91x_match), }, };
This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- Compile tested on linux-next. --- drivers/net/ethernet/smsc/smc91x.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)