diff options
| author | Bartosz Golaszewski <brgl@bgdev.pl> | 2017-11-27 11:48:47 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-12-02 22:42:28 +0100 |
| commit | 1cea4734f954ea66f3c9e89199823f6b917a8e7a (patch) | |
| tree | 0940d1f7f184e7ac7e94b5e600787ee5d136dad8 /drivers/gpio/gpio-mockup.c | |
| parent | gpio: mockup: change the type of value field in line state struct (diff) | |
| download | linux-1cea4734f954ea66f3c9e89199823f6b917a8e7a.tar.xz linux-1cea4734f954ea66f3c9e89199823f6b917a8e7a.zip | |
gpio: mockup: group code by logic
Keep GPIO chip callbacks, event trigger callbacks and mockup chip
setup code visibly separated. We're mostly good - just need to move
the line naming routine below.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpio/gpio-mockup.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index 8a61328a255d..dba5e79e3278 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -123,29 +123,6 @@ static int gpio_mockup_get_direction(struct gpio_chip *gc, unsigned int offset) return chip->lines[offset].dir; } -static int gpio_mockup_name_lines(struct device *dev, - struct gpio_mockup_chip *chip) -{ - struct gpio_chip *gc = &chip->gc; - char **names; - int i; - - names = devm_kcalloc(dev, gc->ngpio, sizeof(char *), GFP_KERNEL); - if (!names) - return -ENOMEM; - - for (i = 0; i < gc->ngpio; i++) { - names[i] = devm_kasprintf(dev, GFP_KERNEL, - "%s-%d", gc->label, i); - if (!names[i]) - return -ENOMEM; - } - - gc->names = (const char *const *)names; - - return 0; -} - static int gpio_mockup_to_irq(struct gpio_chip *gc, unsigned int offset) { struct gpio_mockup_chip *chip = gpiochip_get_data(gc); @@ -238,6 +215,29 @@ err: dev_err(dev, "error creating debugfs directory\n"); } +static int gpio_mockup_name_lines(struct device *dev, + struct gpio_mockup_chip *chip) +{ + struct gpio_chip *gc = &chip->gc; + char **names; + int i; + + names = devm_kcalloc(dev, gc->ngpio, sizeof(char *), GFP_KERNEL); + if (!names) + return -ENOMEM; + + for (i = 0; i < gc->ngpio; i++) { + names[i] = devm_kasprintf(dev, GFP_KERNEL, + "%s-%d", gc->label, i); + if (!names[i]) + return -ENOMEM; + } + + gc->names = (const char *const *)names; + + return 0; +} + static int gpio_mockup_probe(struct platform_device *pdev) { struct gpio_mockup_platform_data *pdata; |