gpio: Rename dm_gpio_get_dir_flags() to dm_gpio_get_flags()

This function can be used to get any flags, not just direction flags.
Rename it to avoid confusion.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Pratyush Yadav <p.yadav@ti.com>

diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index 4d15162bc4d80edaf3f59d03c66883838e1c58d6..42479dba4da0a8f45265243b5d4c1221f05aff65 100644 (file)
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -683,7 +683,7 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
        return _dm_gpio_set_flags(desc, desc->flags);
 }
 
-int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flagsp)
+int dm_gpio_get_flags(struct gpio_desc *desc, ulong *flagsp)
 {
        struct udevice *dev = desc->dev;
        int ret, value;

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 153312d8af43b8b0aa50686a7edb42e97e048e17..4f8d1938da9cb8c5b7271c968a2cfc0ae9885518 100644 (file)
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -683,16 +683,16 @@ int dm_gpio_set_dir(struct gpio_desc *desc);
 int dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong flags);
 
 /**
- * dm_gpio_get_dir_flags() - Get direction flags
+ * dm_gpio_get_flags() - Get flags
  *
- * read the current direction flags
+ * Read the current flags
  *
  * @desc:      GPIO description containing device, offset and flags,
  *             previously returned by gpio_request_by_name()
  * @flags:     place to put the used flags
  * @return 0 if OK, -ve on error, in which case desc->flags is not updated
  */
-int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flags);
+int dm_gpio_get_flags(struct gpio_desc *desc, ulong *flags);
 
 /**
  * gpio_get_number() - Get the global GPIO number of a GPIO

diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 36bbaedb01ce7b0a036bcd35397fefcabd7419c8..c583d2b3447010d2b5c13262e11ec0d6f39a599f 100644 (file)
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -397,22 +397,22 @@ static int dm_test_gpio_get_dir_flags(struct unit_test_state *uts)
        ut_asserteq(6, gpio_request_list_by_name(dev, "test3-gpios", desc_list,
                                                 ARRAY_SIZE(desc_list), 0));
 
-       ut_assertok(dm_gpio_get_dir_flags(&desc_list[0], &flags));
+       ut_assertok(dm_gpio_get_flags(&desc_list[0], &flags));
        ut_asserteq(GPIOD_IS_OUT | GPIOD_OPEN_DRAIN, flags);
 
-       ut_assertok(dm_gpio_get_dir_flags(&desc_list[1], &flags));
+       ut_assertok(dm_gpio_get_flags(&desc_list[1], &flags));
        ut_asserteq(GPIOD_IS_OUT | GPIOD_OPEN_SOURCE, flags);
 
-       ut_assertok(dm_gpio_get_dir_flags(&desc_list[2], &flags));
+       ut_assertok(dm_gpio_get_flags(&desc_list[2], &flags));
        ut_asserteq(GPIOD_IS_OUT, flags);
 
-       ut_assertok(dm_gpio_get_dir_flags(&desc_list[3], &flags));
+       ut_assertok(dm_gpio_get_flags(&desc_list[3], &flags));
        ut_asserteq(GPIOD_IS_IN | GPIOD_PULL_UP, flags);
 
-       ut_assertok(dm_gpio_get_dir_flags(&desc_list[4], &flags));
+       ut_assertok(dm_gpio_get_flags(&desc_list[4], &flags));
        ut_asserteq(GPIOD_IS_IN | GPIOD_PULL_DOWN, flags);
 
-       ut_assertok(dm_gpio_get_dir_flags(&desc_list[5], &flags));
+       ut_assertok(dm_gpio_get_flags(&desc_list[5], &flags));
        ut_asserteq(GPIOD_IS_IN, flags);
 
        ut_assertok(gpio_free_list(dev, desc_list, 6));