pinctrl: at91-pio4: use device_get_match_data()

[linux-2.6-block.git] / drivers / pinctrl / pinctrl-at91-pio4.c

diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c
index f7c37b90b7118c0dd24a012dc403eb427c74841b..58bce1457063bb3d20ca72008396ae90d5a34304 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1067,7 +1067,6 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct pinctrl_pin_desc *pin_desc;
        const char **group_names;
-       const struct of_device_id *match;
        int i, ret;
        struct atmel_pioctrl *atmel_pioctrl;
        const struct atmel_pioctrl_data *atmel_pioctrl_data;
@@ -1079,12 +1078,11 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)
        atmel_pioctrl->node = dev->of_node;
        platform_set_drvdata(pdev, atmel_pioctrl);
 
-       match = of_match_node(atmel_pctrl_of_match, dev->of_node);
-       if (!match) {
-               dev_err(dev, "unknown compatible string\n");
+       atmel_pioctrl_data = device_get_match_data(dev);
+       if (!atmel_pioctrl_data) {
+               dev_err(dev, "Invalid device data\n");
                return -ENODEV;
        }
-       atmel_pioctrl_data = match->data;
        atmel_pioctrl->nbanks = atmel_pioctrl_data->nbanks;
        atmel_pioctrl->npins = atmel_pioctrl->nbanks * ATMEL_PIO_NPINS_PER_BANK;
        /* if last bank has limited number of pins, adjust accordingly */