Merge drm/drm-fixes into drm-misc-fixes

[linux-2.6-microblaze.git] / drivers / gpio / gpio-omap.c

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 5615226..ca23f72 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1373,15 +1373,14 @@ static int omap_gpio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *node = dev->of_node;
-       const struct of_device_id *match;
        const struct omap_gpio_platform_data *pdata;
        struct gpio_bank *bank;
        struct irq_chip *irqc;
        int ret;
 
-       match = of_match_device(of_match_ptr(omap_gpio_match), dev);
+       pdata = device_get_match_data(dev);
 
-       pdata = match ? match->data : dev_get_platdata(dev);
+       pdata = pdata ?: dev_get_platdata(dev);
        if (!pdata)
                return -EINVAL;