From patchwork Mon Nov 28 19:00:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 26922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5885283wrr; Mon, 28 Nov 2022 11:06:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf6/bClVlS1WKmWiMM4PCXHMpOeN15AFRN4HUyHDIMmt4HSIhGBz2EcI4XLOiLgJrUiZffJy X-Received: by 2002:a17:907:77ce:b0:7c0:8225:54d with SMTP id kz14-20020a17090777ce00b007c08225054dmr938922ejc.286.1669662413236; Mon, 28 Nov 2022 11:06:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669662413; cv=none; d=google.com; s=arc-20160816; b=YFNIgdKKWXIeFFcKcg7Ba8ksHe5+vMlttxY4dacRGZhXC8LSUQVDD5+2Xrm//P3k91 lGO9Ye/G1ba2z5eMDAT5cHRv96XpjhV+gfruB1ef1qTbrZ+GVG9DsqLgodCiJHVuizij PfZNrmymvwSdsUvMnAMS4MJbQnHvmSo/sRw0oEykcEq9Nh6OZi+w7IMhMK7fpezuWvTt xXXB5G0EHo3euDT4dx1OthxmGxH2sOytLg6cjgURkoKx5durRz48mJ4V/urE7aGmCo4q CWL6yxAWBM1MqUsLKP/ZhgdPS4DclfyFjzYLF16HvRJFErFEizGXy0WJSjLblBpOamIb HjSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=u530TiNgKCtNLpKFLj7LdwobKa2paz+K35uJUUlwNNw=; b=kUP3tQdSrySwUIubFjT460l7s2YR0O2vjV5z4BIcvaRHtdSDG0Q8giVug5fx+UJkLv 7BXclaAPv6ziOO26T5YbmhbCNhY7LCn6pujfE85PTiQSdtGXMmR1/bfjNW18o2XsVwfL OEoXe/fgKKqhae2Ojyckuj/+EtXf7RA0aF0LBLq5roT7B+d6lUxZNpVWlkr8NdQmK7nf UcCFZpp9DuEbdIn0h11ytKtAnDOvgcbXUNCiAmzTbOgzKTPNZ9Nou/tPPV23SfUE64+H tiI65JQ1wzdFBoYN4sjo+UHWpMbW8GQlXSisHvgDEPeNL2co2BSC43lncJr1+aRbPTAO BYqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cDbhoIZP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc12-20020a1709078a0c00b007adca6532e3si10351020ejc.229.2022.11.28.11.06.29; Mon, 28 Nov 2022 11:06:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cDbhoIZP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233020AbiK1TAt (ORCPT + 99 others); Mon, 28 Nov 2022 14:00:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231734AbiK1TAr (ORCPT ); Mon, 28 Nov 2022 14:00:47 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6BD425280; Mon, 28 Nov 2022 11:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669662047; x=1701198047; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=mUQHV/DcKFfPtd53tvm4FTuNIbAukvui9T3fDp+KlAc=; b=cDbhoIZPo1m0xawMQXLbmewSWDUKr8XK9OICb6mF7C5rSBBrmi53Aj3m dyx7wgq/obQ8+j1FEjILEb9qo5x1iWWjzxUoSbCgGGAHJxjjxAxSeY104 NBE0BzuPmMRYHWMitM0s8glQ1u87xCMbdWDVPE8LN58epWX7z94aE8iWD fsJNJ88uFygia4vZsry60Ck9Np9WYHGeUwHW3cqW1MMk62DelO9IHN6O9 qJLYk7YA+4Za8PZ2VjMZHaKtRJeKrfkeBWRfBkxjq3ZNoiLEsgGcf7ZzB b/eJODpF4yxN63doZFPVaX3DQnJcUgXKlpxxFGTphzOZDYmjZKqUXQAZa A==; X-IronPort-AV: E=McAfee;i="6500,9779,10545"; a="313628916" X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="313628916" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2022 11:00:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10545"; a="712083610" X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="712083610" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 28 Nov 2022 11:00:30 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3DE3D10E; Mon, 28 Nov 2022 21:00:57 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH v2 1/2] gpiolib: Provide to_gpio_device() helper Date: Mon, 28 Nov 2022 21:00:54 +0200 Message-Id: <20221128190055.6350-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750767934199233219?= X-GMAIL-MSGID: =?utf-8?q?1750767934199233219?= Provide to_gpio_device() helper which can be utilized in the existing and future code. While at it, make sure it becomes no-op at compilation time. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- v2: made helper static inline (Bart) drivers/gpio/gpiolib.c | 2 +- drivers/gpio/gpiolib.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a11480634213..ccd47da4ec66 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -548,7 +548,7 @@ EXPORT_SYMBOL_GPL(gpiochip_line_is_valid); static void gpiodevice_release(struct device *dev) { - struct gpio_device *gdev = container_of(dev, struct gpio_device, dev); + struct gpio_device *gdev = to_gpio_device(dev); unsigned long flags; spin_lock_irqsave(&gpio_lock, flags); diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index d900ecdbac46..e443c1023a37 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -20,9 +20,9 @@ /** * struct gpio_device - internal state container for GPIO devices - * @id: numerical ID number for the GPIO chip * @dev: the GPIO device struct * @chrdev: character device for the GPIO device + * @id: numerical ID number for the GPIO chip * @mockdev: class device used by the deprecated sysfs interface (may be * NULL) * @owner: helps prevent removal of modules exporting active GPIOs @@ -47,9 +47,9 @@ * userspace. */ struct gpio_device { - int id; struct device dev; struct cdev chrdev; + int id; struct device *mockdev; struct module *owner; struct gpio_chip *chip; @@ -72,6 +72,11 @@ struct gpio_device { #endif }; +static inline struct gpio_device *to_gpio_device(struct device *dev) +{ + return container_of(dev, struct gpio_device, dev); +} + /* gpio suffixes used for ACPI and device tree lookup */ static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" }; From patchwork Mon Nov 28 19:00:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 26923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5885598wrr; Mon, 28 Nov 2022 11:07:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf73NuOASmltj/8SkH4Pnelhw46fMZqIK9Fn5Z+86fjyyPW4JvXKTQ4XurrfE2KY1dH0gQlU X-Received: by 2002:a17:906:32ce:b0:78d:9022:f146 with SMTP id k14-20020a17090632ce00b0078d9022f146mr28244552ejk.656.1669662453231; Mon, 28 Nov 2022 11:07:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669662453; cv=none; d=google.com; s=arc-20160816; b=Z+H+ghzvCcGT2DmoUDi0vVmzYNE8fNHzfnS0rddQ9kWeI60g0ccUpQQvMjAAMjjpy3 PwiIW3/DzQsMkIM8mKqd2AezCMA9u+a2er7kXGMNmwqs3c21KIccX5sc7QlmnyuyK/wL PCdWlnupGGxUVjEwQZGqKWdX7CUG28USLongi5Yxur3A1Mmw1lcSeyjDwn2nrCvcXdPu dRLYPw6EjHeUhx7k4z2BJ1ASmsMp08bOhvnEkvMYCUYdPtg3hpe7AK9Ju12j1gEIkZFz AYDactE337SIfKOpIwpLdq3+I7AcFJA5w1N8KJtSlXGZrT4HOL6aDPOUZ+9xZBBtA8iJ 5mgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R8aorCOKgtMO6sdoZCbL6BA/Ql8KNS2e/zzGJOumCLU=; b=pV2B1qPNiUSZQ5505H1FVVwryfZA1Bb4rr0Du8NUzP8AaeMn7Oj63JyQkbLCNettFI g5vpqnz12r2mMi6JEYs1OAg7vcAeGeNLRrHxQhRRnhrc3LOh92KdZ/0ZxseCFtyIIR9f ThJV6yvXG2Z9Mpe18631yFXXa0/7JT/YorhrtGKE0bAxw+kvtelGAldXjN4AG/OBl2yG blIWg5+JOnjC0kBv/JI3MzuD5ws3WTkL0cZ8gJI4iUb6QPF0fvDjgQHt9Qvznc0681Ob k4i5oy/qjcEKOuX51/MtqQyZ7yUsWMyCD+HGslpGlnUNciMdffijVTDyJHyGnb6CQvz1 ce0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=B+Y4SlZs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh17-20020a1709076e9100b00779f8e7ec5bsi11018845ejc.42.2022.11.28.11.07.09; Mon, 28 Nov 2022 11:07:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=B+Y4SlZs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233058AbiK1TAy (ORCPT + 99 others); Mon, 28 Nov 2022 14:00:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232651AbiK1TAt (ORCPT ); Mon, 28 Nov 2022 14:00:49 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C431B252AC; Mon, 28 Nov 2022 11:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669662047; x=1701198047; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z4oZmTYf6q1xtHMQPZlks9ZpsjlcYED/5kdCjfxnLVI=; b=B+Y4SlZsFC7IkY3gQ8fjVl+HPqfxPoD5FPKhPoBtOySj1UgsffxndaaN H+Um5ICk1npZR1y2fLi39tnySKFRSW4UBbZjAefs7gRzrhMUH8m4fW3z9 Jymorbl4+ZDNCOIePggO84r4x9XiulMhDcyG3wWCm+HYMSaikFe4AkR5o jD9243dlUZBx2cyjA/Yb/IFJcXw09j3KZoKd1pFINu/p1Ni4tqO0FBEBs C4LS/fxdhbMDzVaDKgN0ZQksHfogw2wwGEK/FtDLDc5Bjgd5ulCLlf2DM ozfXtEbzex3mcCEutV4iVZymJo7UMnq7B38oJB2y8xJyRk28CJWouGI/m Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10545"; a="313628918" X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="313628918" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2022 11:00:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10545"; a="712083613" X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="712083613" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 28 Nov 2022 11:00:31 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id C5913179; Mon, 28 Nov 2022 21:00:57 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH v2 2/2] gpiolib: Introduce gpio_device_get() and gpio_device_put() Date: Mon, 28 Nov 2022 21:00:55 +0200 Message-Id: <20221128190055.6350-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221128190055.6350-1-andriy.shevchenko@linux.intel.com> References: <20221128190055.6350-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750767976200492348?= X-GMAIL-MSGID: =?utf-8?q?1750767976200492348?= Introduce gpio_device_get() and gpio_device_put() helpers and convert existing users. Signed-off-by: Andy Shevchenko --- v2: no changes drivers/gpio/gpiolib-cdev.c | 21 +++++++++------------ drivers/gpio/gpiolib.c | 14 ++++++-------- drivers/gpio/gpiolib.h | 10 ++++++++++ 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 8ecec2f56321..a76f2e79a776 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -265,7 +265,7 @@ static void linehandle_free(struct linehandle_state *lh) if (lh->descs[i]) gpiod_free(lh->descs[i]); kfree(lh->label); - put_device(&lh->gdev->dev); + gpio_device_put(lh->gdev); kfree(lh); } @@ -307,8 +307,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip) lh = kzalloc(sizeof(*lh), GFP_KERNEL); if (!lh) return -ENOMEM; - lh->gdev = gdev; - get_device(&gdev->dev); + lh->gdev = gpio_device_get(gdev); if (handlereq.consumer_label[0] != '\0') { /* label is only initialized if consumer_label is set */ @@ -1487,7 +1486,7 @@ static void linereq_free(struct linereq *lr) } kfifo_free(&lr->events); kfree(lr->label); - put_device(&lr->gdev->dev); + gpio_device_put(lr->gdev); kfree(lr); } @@ -1557,8 +1556,7 @@ static int linereq_create(struct gpio_device *gdev, void __user *ip) if (!lr) return -ENOMEM; - lr->gdev = gdev; - get_device(&gdev->dev); + lr->gdev = gpio_device_get(gdev); for (i = 0; i < ulr.num_lines; i++) { lr->lines[i].req = lr; @@ -1806,7 +1804,7 @@ static void lineevent_free(struct lineevent_state *le) if (le->desc) gpiod_free(le->desc); kfree(le->label); - put_device(&le->gdev->dev); + gpio_device_put(le->gdev); kfree(le); } @@ -1972,8 +1970,7 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) le = kzalloc(sizeof(*le), GFP_KERNEL); if (!le) return -ENOMEM; - le->gdev = gdev; - get_device(&gdev->dev); + le->gdev = gpio_device_get(gdev); if (eventreq.consumer_label[0] != '\0') { /* label is only initialized if consumer_label is set */ @@ -2521,7 +2518,7 @@ static int gpio_chrdev_open(struct inode *inode, struct file *file) init_waitqueue_head(&cdev->wait); INIT_KFIFO(cdev->events); - cdev->gdev = gdev; + cdev->gdev = gpio_device_get(gdev); cdev->lineinfo_changed_nb.notifier_call = lineinfo_changed_notify; ret = blocking_notifier_chain_register(&gdev->notifier, @@ -2529,7 +2526,6 @@ static int gpio_chrdev_open(struct inode *inode, struct file *file) if (ret) goto out_free_bitmap; - get_device(&gdev->dev); file->private_data = cdev; ret = nonseekable_open(inode, file); @@ -2542,6 +2538,7 @@ static int gpio_chrdev_open(struct inode *inode, struct file *file) blocking_notifier_chain_unregister(&gdev->notifier, &cdev->lineinfo_changed_nb); out_free_bitmap: + gpio_device_put(gdev); bitmap_free(cdev->watched_lines); out_free_cdev: kfree(cdev); @@ -2562,7 +2559,7 @@ static int gpio_chrdev_release(struct inode *inode, struct file *file) bitmap_free(cdev->watched_lines); blocking_notifier_chain_unregister(&gdev->notifier, &cdev->lineinfo_changed_nb); - put_device(&gdev->dev); + gpio_device_put(gdev); kfree(cdev); return 0; diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index ccd47da4ec66..a54bad1ea3e5 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -875,7 +875,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, gpiochip_free_valid_mask(gc); if (gdev->dev.release) { /* release() has been registered by gpiochip_setup_dev() */ - put_device(&gdev->dev); + gpio_device_put(gdev); goto err_print_message; } err_remove_from_list: @@ -962,7 +962,7 @@ void gpiochip_remove(struct gpio_chip *gc) * gone. */ gcdev_unregister(gdev); - put_device(&gdev->dev); + gpio_device_put(gdev); } EXPORT_SYMBOL_GPL(gpiochip_remove); @@ -2053,17 +2053,15 @@ static int validate_desc(const struct gpio_desc *desc, const char *func) int gpiod_request(struct gpio_desc *desc, const char *label) { int ret = -EPROBE_DEFER; - struct gpio_device *gdev; VALIDATE_DESC(desc); - gdev = desc->gdev; - if (try_module_get(gdev->owner)) { + if (try_module_get(desc->gdev->owner)) { ret = gpiod_request_commit(desc, label); if (ret) - module_put(gdev->owner); + module_put(desc->gdev->owner); else - get_device(&gdev->dev); + gpio_device_get(desc->gdev); } if (ret) @@ -2124,7 +2122,7 @@ void gpiod_free(struct gpio_desc *desc) { if (desc && desc->gdev && gpiod_free_commit(desc)) { module_put(desc->gdev->owner); - put_device(&desc->gdev->dev); + gpio_device_put(desc->gdev); } else { WARN_ON(extra_checks); } diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index e443c1023a37..c342950ad200 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -77,6 +77,16 @@ static inline struct gpio_device *to_gpio_device(struct device *dev) return container_of(dev, struct gpio_device, dev); } +static inline struct gpio_device *gpio_device_get(struct gpio_device *gdev) +{ + return to_gpio_device(get_device(&gdev->dev)); +} + +static inline void gpio_device_put(struct gpio_device *gdev) +{ + put_device(&gdev->dev); +} + /* gpio suffixes used for ACPI and device tree lookup */ static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" };