summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-12-19 02:17:09 +0100
committerDavid S. Miller <davem@davemloft.net>2012-12-19 21:50:07 +0100
commit89ce376c6bdc936515147ff14f8a62cead965683 (patch)
tree9b40324371b3f9ea6cc606603c51ee74641b557a /drivers/net
parentipv6: addrconf.c: remove unnecessary "if" (diff)
downloadlinux-89ce376c6bdc936515147ff14f8a62cead965683.tar.xz
linux-89ce376c6bdc936515147ff14f8a62cead965683.zip
drivers/net: Use of_match_ptr() macro in smc91x.c
This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 022b45bc14ff..a670d23d9340 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),
},
};