spi: davinci: Use of_match_ptr at appropriate place

It's pointless to use of_match_ptr within CONFIG_OF guard.
Use of_match_ptr around davinci_spi_of_match when setting .of_match_table.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 04d69b6..50f7509 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -802,8 +802,7 @@ static int spi_davinci_get_pdata(struct platform_device *pdev,
        pdata = &dspi->pdata;
 
        pdata->version = SPI_VERSION_1;
-       match = of_match_device(of_match_ptr(davinci_spi_of_match),
-                               &pdev->dev);
+       match = of_match_device(davinci_spi_of_match, &pdev->dev);
        if (!match)
                return -ENODEV;
 
@@ -824,7 +823,6 @@ static int spi_davinci_get_pdata(struct platform_device *pdev,
        return 0;
 }
 #else
-#define davinci_spi_of_match NULL
 static struct davinci_spi_platform_data
        *spi_davinci_get_pdata(struct platform_device *pdev,
                struct davinci_spi *dspi)
@@ -1032,7 +1030,7 @@ static struct platform_driver davinci_spi_driver = {
        .driver = {
                .name = "spi_davinci",
                .owner = THIS_MODULE,
-               .of_match_table = davinci_spi_of_match,
+               .of_match_table = of_match_ptr(davinci_spi_of_match),
        },
        .probe = davinci_spi_probe,
        .remove = davinci_spi_remove,