summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-03-14 00:13:03 +0000
committerWolfram Sang <wsa@the-dreams.de>2013-03-29 12:41:43 +0100
commit600abeadf318fbdb25e1e3e4379f6a7bb1952d5b (patch)
treef01995378964ce69fe3803607b2b72d82fcfcd28
parent857968434bb6dbda0911f38ec46b0c3d0c963771 (diff)
downloadlinux-3.10-600abeadf318fbdb25e1e3e4379f6a7bb1952d5b.tar.gz
linux-3.10-600abeadf318fbdb25e1e3e4379f6a7bb1952d5b.tar.bz2
linux-3.10-600abeadf318fbdb25e1e3e4379f6a7bb1952d5b.zip
i2c: at91: Use of_match_ptr() macro
This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r--drivers/i2c/busses/i2c-at91.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 75195e3f5dd..23a1c44be34 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -603,8 +603,6 @@ static const struct of_device_id atmel_twi_dt_ids[] = {
}
};
MODULE_DEVICE_TABLE(of, atmel_twi_dt_ids);
-#else
-#define atmel_twi_dt_ids NULL
#endif
static bool filter(struct dma_chan *chan, void *slave)
@@ -828,7 +826,7 @@ static struct platform_driver at91_twi_driver = {
.driver = {
.name = "at91_i2c",
.owner = THIS_MODULE,
- .of_match_table = atmel_twi_dt_ids,
+ .of_match_table = of_match_ptr(atmel_twi_dt_ids),
.pm = at91_twi_pm_ops,
},
};