From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13D993D1718; Mon, 27 Apr 2026 13:59:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777298397; cv=none; b=UBERj1iONEgJspypdxPWOGdOBf0wcBMLKSoZSbzHjyhB8nvbc5RZtEurqnivm4FxA6pJHXUZ+hwEo2yxGYkXw5yWjNAfxwiWoWP65j4fhsiMLPW8ldd5K4A98EwePPE4iXHwgXvlbWcvxWiZkisgMeKI/ebggIC48dQ3HME2vv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777298397; c=relaxed/simple; bh=A0bBw5kX2PcEGrGydzNJGenhRnml/vr74DA7iWqMtqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pTpUwH9REndjMIwzewCLiPz49m/P8RHLLfUvH8pIstnmIFpot/FUhs5602KtweC5uau0/V2l4r6sm1VKXRkGWnXnAFzXRGoXmPTPCx3bvzYd16PexNBuUrscmNcZ4UnIP+uL2dCN89srT7CW9lVdRg8Fm8SOgu3Ol6vPs9t1d1g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nngamBBq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nngamBBq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 297D9C2BCC4; Mon, 27 Apr 2026 13:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777298396; bh=A0bBw5kX2PcEGrGydzNJGenhRnml/vr74DA7iWqMtqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nngamBBqaE3iQVzDKKHSZNDDV4DcQQ6MUv2WQVTRCU0pJZxZ+mMR9JEP9WU7/oZz1 WOb5dwezJnQ/tc3yIu0UhsSc+Vel9hot3pm6iTpOPSHI8qNH6wcGWm3u2seaQ3bWkj IUO+LCQcpOEPJHOZPq8jikIiSnWyuaWKj0l4kmOMriarU+DULJfaqQAAh/w9DUBORk y54WH95SUhHXcA8TVUynKiNmQgPy3Z3HmT2gH46ZZRZha+OcFz4rGQpi5MlwecP6Cv jKXf9ITX1WJHBme1EQFaoekelAHjrkK4xD1j9YFKCKAZwOnWH8NG0IfteqEoOfk/0E V6N5XUGq/SQTA== From: Tzung-Bi Shih To: Arnd Bergmann , Greg Kroah-Hartman , Bartosz Golaszewski , Linus Walleij Cc: Benson Leung , tzungbi@kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev, driver-core@lists.linux.dev, linux-doc@vger.kernel.org, linux-gpio@vger.kernel.org, "Rafael J. Wysocki" , Danilo Krummrich , Jonathan Corbet , Shuah Khan , Laurent Pinchart , Wolfram Sang , Jason Gunthorpe , Johan Hovold , "Paul E . McKenney" , Dan Williams Subject: [PATCH v9 7/9] gpio: Remove unused `chip` and `srcu` in struct gpio_device Date: Mon, 27 Apr 2026 21:58:39 +0800 Message-ID: <20260427135841.96266-8-tzungbi@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260427135841.96266-1-tzungbi@kernel.org> References: <20260427135841.96266-1-tzungbi@kernel.org> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit `chip` and `srcu` in struct gpio_device are unused as their usages are replaced to use revocable. Remove them. Signed-off-by: Tzung-Bi Shih --- v9: - New to the series. - No changes. v4 - v8: - Doesn't exist. v3: https://lore.kernel.org/all/20260213092958.864411-12-tzungbi@kernel.org - No changes. v2: https://lore.kernel.org/all/20260203061059.975605-12-tzungbi@kernel.org - No changes. v1: https://lore.kernel.org/all/20260116081036.352286-24-tzungbi@kernel.org --- drivers/gpio/gpiolib.c | 26 +------------------------- drivers/gpio/gpiolib.h | 4 ---- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 798fd5f52745..5ea9e596282a 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -428,8 +428,6 @@ static int gpiochip_get_direction(struct gpio_chip *gc, unsigned int offset) { int ret; - lockdep_assert_held(&gc->gpiodev->srcu); - if (WARN_ON(!gc->get_direction)) return -EOPNOTSUPP; @@ -879,7 +877,6 @@ static void gpiodev_release(struct device *dev) ida_free(&gpio_ida, gdev->id); kfree_const(gdev->label); kfree(gdev->descs); - cleanup_srcu_struct(&gdev->srcu); kfree(gdev); } @@ -1154,14 +1151,9 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, goto err_free_gdev; gdev->id = ret; - ret = init_srcu_struct(&gdev->srcu); - if (ret) - goto err_free_ida; - rcu_assign_pointer(gdev->chip, gc); - ret = init_srcu_struct(&gdev->desc_srcu); if (ret) - goto err_cleanup_gdev_srcu; + goto err_free_ida; ret = dev_set_name(&gdev->dev, GPIOCHIP_NAME "%d", gdev->id); if (ret) @@ -1353,8 +1345,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, err_cleanup_desc_srcu: cleanup_srcu_struct(&gdev->desc_srcu); -err_cleanup_gdev_srcu: - cleanup_srcu_struct(&gdev->srcu); err_free_ida: ida_free(&gpio_ida, gdev->id); err_free_gdev: @@ -1391,8 +1381,6 @@ void gpiochip_remove(struct gpio_chip *gc) synchronize_srcu(&gpio_devices_srcu); /* Numb the device, cancelling all outstanding operations */ - rcu_assign_pointer(gdev->chip, NULL); - synchronize_srcu(&gdev->srcu); revocable_revoke(&gdev->chip_rev); gpio_device_teardown_shared(gdev); gpiochip_irqchip_remove(gc); @@ -2903,8 +2891,6 @@ static int gpiochip_direction_input(struct gpio_chip *gc, unsigned int offset) { int ret; - lockdep_assert_held(&gc->gpiodev->srcu); - if (WARN_ON(!gc->direction_input)) return -EOPNOTSUPP; @@ -2920,8 +2906,6 @@ static int gpiochip_direction_output(struct gpio_chip *gc, unsigned int offset, { int ret; - lockdep_assert_held(&gc->gpiodev->srcu); - if (WARN_ON(!gc->direction_output)) return -EOPNOTSUPP; @@ -3009,8 +2993,6 @@ static int gpiochip_set(struct gpio_chip *gc, unsigned int offset, int value) { int ret; - lockdep_assert_held(&gc->gpiodev->srcu); - if (WARN_ON(unlikely(!gc->set))) return -EOPNOTSUPP; @@ -3358,8 +3340,6 @@ static int gpiochip_get(struct gpio_chip *gc, unsigned int offset) { int ret; - lockdep_assert_held(&gc->gpiodev->srcu); - /* Make sure this is called after checking for gc->get(). */ ret = gc->get(gc, offset); if (ret > 1) { @@ -3415,8 +3395,6 @@ static int gpiod_get_raw_value_commit(const struct gpio_desc *desc) static int gpio_chip_get_multiple(struct gpio_chip *gc, unsigned long *mask, unsigned long *bits) { - lockdep_assert_held(&gc->gpiodev->srcu); - if (gc->get_multiple) { int ret; @@ -3760,8 +3738,6 @@ static int gpiochip_set_multiple(struct gpio_chip *gc, unsigned int i; int ret; - lockdep_assert_held(&gc->gpiodev->srcu); - if (gc->set_multiple) { ret = gc->set_multiple(gc, mask, bits); if (ret > 0) diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index 90ad9b7fdfdd..efbff4a1cd4e 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -32,7 +32,6 @@ struct fwnode_handle; * @chrdev: character device for the GPIO device * @id: numerical ID number for the GPIO chip * @owner: helps prevent removal of modules exporting active GPIOs - * @chip: pointer to the corresponding gpiochip, holding static * data for this device * @descs: array of ngpio descriptors. * @valid_mask: If not %NULL, holds bitmask of GPIOs which are valid to be @@ -55,7 +54,6 @@ struct fwnode_handle; * process context * @device_notifier: used to notify character device wait queues about the GPIO * device being unregistered - * @srcu: protects the pointer to the underlying GPIO chip * @chip_rev: revocable provider handle for the corresponding struct gpio_chip. * @pin_ranges: range of pins served by the GPIO driver * @@ -69,7 +67,6 @@ struct gpio_device { struct cdev chrdev; int id; struct module *owner; - struct gpio_chip __rcu *chip; struct gpio_desc *descs; unsigned long *valid_mask; struct srcu_struct desc_srcu; @@ -83,7 +80,6 @@ struct gpio_device { rwlock_t line_state_lock; struct workqueue_struct *line_state_wq; struct blocking_notifier_head device_notifier; - struct srcu_struct srcu; struct revocable chip_rev; #ifdef CONFIG_PINCTRL -- 2.51.0