gpio: htc-egpio: Unique label per chip

Give the HTC EGPIO chips unique names, htc-egpio-0,
htc-egpio-1 etc, so that it gets possible to associate
machine descriptor tables with individual chips.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-htc-egpio.c b/drivers/gpio/gpio-htc-egpio.c
index ad6e5b5186691b01ed7cd301acc6a95985c41933..38be44dbd6e14d02d62199125ae7400151f8c08d 100644 (file)
--- a/drivers/gpio/gpio-htc-egpio.c
+++ b/drivers/gpio/gpio-htc-egpio.c
@@ -334,7 +334,13 @@ static int __init egpio_probe(struct platform_device *pdev)
                ei->chip[i].is_out = pdata->chip[i].direction;
                ei->chip[i].dev = &(pdev->dev);
                chip = &(ei->chip[i].chip);
-               chip->label           = "htc-egpio";
+               chip->label = devm_kasprintf(&pdev->dev, GFP_KERNEL,
+                                            "htc-egpio-%d",
+                                            i);
+               if (!chip->label) {
+                       ret = -ENOMEM;
+                       goto fail;
+               }
                chip->parent          = &pdev->dev;
                chip->owner           = THIS_MODULE;
                chip->get             = egpio_get;