gpiolib_dbg_show() is only called by gpiolib_seq_show() which has
ensured the struct gpio_chip.  Remove the redundant check in
gpiolib_dbg_show().

Signed-off-by: Tzung-Bi Shih <[email protected]>
---
 drivers/gpio/gpiolib.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 3242644eebc6..42da3bbc5ab8 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -5313,23 +5313,14 @@ core_initcall(gpiolib_dev_init);
 
 #ifdef CONFIG_DEBUG_FS
 
-static void gpiolib_dbg_show(struct seq_file *s, struct gpio_device *gdev)
+static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *gc)
 {
        bool active_low, is_irq, is_out;
        struct gpio_desc *desc;
        unsigned int gpio = 0;
-       struct gpio_chip *gc;
        unsigned long flags;
        int value;
 
-       guard(srcu)(&gdev->srcu);
-
-       gc = srcu_dereference(gdev->chip, &gdev->srcu);
-       if (!gc) {
-               seq_puts(s, "Underlying GPIO chip is gone\n");
-               return;
-       }
-
        for_each_gpio_desc(gc, desc) {
                guard(srcu)(&desc->gdev->desc_srcu);
                flags = READ_ONCE(desc->flags);
@@ -5442,7 +5433,7 @@ static int gpiolib_seq_show(struct seq_file *s, void *v)
        if (gc->dbg_show)
                gc->dbg_show(s, gc);
        else
-               gpiolib_dbg_show(s, gdev);
+               gpiolib_dbg_show(s, gc);
 
        return 0;
 }
-- 
2.52.0.457.g6b5491de43-goog


Reply via email to