From patchwork Tue Mar 21 13:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 72878 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1796209wrt; Tue, 21 Mar 2023 07:05:10 -0700 (PDT) X-Google-Smtp-Source: AK7set8zGkPuFBZZcMHI/Rfmfweaia1O10biwnHVG9CXNAEvWPUL14uq5DOnuzP2i82tKU48ZQwE X-Received: by 2002:a17:90b:3b4d:b0:234:384f:79c with SMTP id ot13-20020a17090b3b4d00b00234384f079cmr2769051pjb.33.1679407510072; Tue, 21 Mar 2023 07:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679407510; cv=none; d=google.com; s=arc-20160816; b=HISSR3HMn2Pcv9n0yQ3JsTCDRrB3SmsBnu/On4TOlqK0M3j3z2/+wXwMaoSoSiJwRx kTRSh8DbjjM7bDVssCBKwSGtMCcQhZh+M1NrAYAhSPyvrLqFibRPRehlibvzrNCHCrmo L/+PhHuHFGosyofscaK1sWG42sU4Y9TeHkOyUinYSwFRFLsqkGMwjjEFpAfpV5d+BkX8 0XM5Rgb382YTT1wurmaW+qZ1vydnb3q+CoSl6SNt99LCcGIgkVR+m7+J94n4pfegVe63 xYY0sjtk4QEYH+3LV6ejC/wVSBet2VYc3FJS4FYQr+nIKa2ePEW1N4H8Vgmate6k7K0N kVtQ== 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=QFCZUT91DkjdKXZLTwfcY0giYmqdhfzzBJXg9MLHonc=; b=wmg8ViSodT5u6r00GDJgWxB9QKu6/Nz7eIGaMLS6j+2ui1Nwk47CqktXkU7RTsoofP I+VbFCMUS0Auc5WUJfdRba5IK83DGw6aot0ZvTrFvOb7rA3RrjybgqUORdE0S6TdbaJF f4bdjIWrc5XXG2yusUMzmygdpBFymr/WdvhK0OTD0EsBewI4agaNYk/O1F9WAn1+70xl Cs6Ir3xdmmaAajFiHZnj1cib5bKRzaievrTOTpdGsbGoGISX0U1K9RDlk2vpC4dijRlS c0mLaA+Nn3AkHNtbVqQaxDHRvXHHsag2KNSsZ5n7Cq7FblC/Zw5wIYQT1de0Ljh3ALKs FiFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ea0tm683; 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 l6-20020a17090a4d4600b0023d269ed307si13262356pjh.32.2023.03.21.07.04.53; Tue, 21 Mar 2023 07:05:10 -0700 (PDT) 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=Ea0tm683; 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 S231260AbjCUNxB (ORCPT + 99 others); Tue, 21 Mar 2023 09:53:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231245AbjCUNw7 (ORCPT ); Tue, 21 Mar 2023 09:52:59 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D2124989B; Tue, 21 Mar 2023 06:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679406776; x=1710942776; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=vRtWISRYp6eq3qtKs90frTmSpRak5mes5ShFcbgo/vQ=; b=Ea0tm683u4K+SlHUFecLkZNdyi4tmDJJyrNYqZj0Fn7Mpg8ZjUH8TrEY dcEelyL5sbeym7o/7MmXtQiza8brkPdLv3jm2+8xINnbbQQ+6mNzGsW/f 9WCC85rEpkJzOs4m28yXoy9wuEhU516tosI4uKcsIxa4tAIMUWfd5mi89 WmYOJIQLoN1z6sCwNlsIrCXbyDEX1VVvkwuOqQ1xFOfJzC5t3c0yWb+r+ UK087trJ4ahxSOKgvidafhpzCpQc6N2YRdJhoZBZDyquKj1aY6aAH9B/G aT19p1NbWnWn9OJdnCIP7cFmqUoJzfp489H//5c/mVGk2nS5k9zrKYPfM g==; X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="338980342" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="338980342" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2023 06:52:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="927410577" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="927410577" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 21 Mar 2023 06:52:52 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2AD2E3DD; Tue, 21 Mar 2023 15:53:37 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 1/2] gpiolib: Move gpiochip_get_data() upper in the code Date: Tue, 21 Mar 2023 15:53:31 +0200 Message-Id: <20230321135332.73190-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b 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,URIBL_BLOCKED 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?1760986409486842946?= X-GMAIL-MSGID: =?utf-8?q?1760986409486842946?= Move gpiochip_get_data() upper in the code as a preparation for further refactoring. Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 62114d69bcea..2bfc474d99c3 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -681,6 +681,19 @@ static void gpiochip_setup_devs(void) } } +/** + * gpiochip_get_data() - get per-subdriver data for the chip + * @gc: GPIO chip + * + * Returns: + * The per-subdriver data for the chip. + */ +void *gpiochip_get_data(struct gpio_chip *gc) +{ + return gc->gpiodev->data; +} +EXPORT_SYMBOL_GPL(gpiochip_get_data); + int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, struct lock_class_key *lock_key, struct lock_class_key *request_key) @@ -939,19 +952,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, } EXPORT_SYMBOL_GPL(gpiochip_add_data_with_key); -/** - * gpiochip_get_data() - get per-subdriver data for the chip - * @gc: GPIO chip - * - * Returns: - * The per-subdriver data for the chip. - */ -void *gpiochip_get_data(struct gpio_chip *gc) -{ - return gc->gpiodev->data; -} -EXPORT_SYMBOL_GPL(gpiochip_get_data); - /** * gpiochip_remove() - unregister a gpio_chip * @gc: the chip to unregister From patchwork Tue Mar 21 13:53:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 72885 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1799781wrt; Tue, 21 Mar 2023 07:10:33 -0700 (PDT) X-Google-Smtp-Source: AK7set/528Xa1qez0/8c/svZVCTKtC0NIHE/QD8b4HUnZJzIDkrzob6fPA5zwLNTl3kUq3nWgkq2 X-Received: by 2002:a05:6870:c225:b0:177:8ddc:9840 with SMTP id z37-20020a056870c22500b001778ddc9840mr1071970oae.9.1679407833446; Tue, 21 Mar 2023 07:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679407833; cv=none; d=google.com; s=arc-20160816; b=eJ/p1983Xs6YBKwFoHJwT3XXF4x+YAlcw72avQG7hgtI0oY8yKtpo64ou6JamdztHl 1n5lEaEhex+wDztHtV+8GZVi9iDAR6nvwYJI0QN2QvS2SuPRTX4sPW61yMS10T3w6HmP nOdlVmjThCsvDGzNMrgHyJxlXrucv+9V8RqHOHQN2qWoojrJevXGuieReum5xmZT/JvZ 1/XNuzN/7TAZI4olvQkPKp8uTBdVKGaI7dxjI+0bRPn1qpdlcuMunkpyzghnLWDc7ghi wx7q8t/KvN5mlQ4rIbuCsEnHVKeQEzTmsf0MWaEzGOAo/Jp5HGp9vA5c9IpWkx/cobkJ 9bBA== 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=WKW1jdFwVIuB/bGR16kbKfSvhrj8Z/OnyjVMEf91yGw=; b=vSocEXxmnxv05IbrWYMqJJQ1IzuH0Nic6H64jxiZoS1oWeatNHXNYWzwfUfUoQfI63 mRSFLKSLWxIWZvg5qhai6q+0FnBkUy8AjHKvFQ6RDEZ/nHZ+Dwi3/MgHSRwyAqTq5mj/ C1spURC4aJIdsa8RI59jdkMnPBqFNt5HUDFiAKK4ofVUbufmSweY9M/hjotQmfM4H8m3 jwKPXfeyQi3VB0QQ/9nRi4+lXoHQVEa3barXHROp6T2FGZ36sx8s2VoZQJDGXQ2tlvoo /G5nJM0dtVMPLPvUVCNvbLzMUlZHuGB56+olPctAvjHDf2ysCQEOMw2IRHTiBPNRmF7B tNOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HfGsa+Wr; 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 i11-20020a056870344b00b0016de7fb2eecsi10817434oah.335.2023.03.21.07.10.20; Tue, 21 Mar 2023 07:10:33 -0700 (PDT) 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=HfGsa+Wr; 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 S230169AbjCUNxE (ORCPT + 99 others); Tue, 21 Mar 2023 09:53:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231254AbjCUNxA (ORCPT ); Tue, 21 Mar 2023 09:53:00 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95CF94A1C7; Tue, 21 Mar 2023 06:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679406776; x=1710942776; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hih2m2l9MHORIYrioILT7AecrZMqNTqBdwbA/XpbI0U=; b=HfGsa+WrEi4rTYNcnuMQK2txZyQgiYkcL+oNPfZe6NR2g9jPpW3Vvzsi a7GuV+d+KzFTV5rTqd6gaJX9r+uQrKp/ZQEHNJ87BDLW+kOsof+uzxXwW ptIJKKIVDym6o9WMHwuiZTM5d1BnB95mAgVApeHcJoFopcJzR40hLh33d PP8S2txTO7UE84rdFqRJdLKIK3GdLL7VO5JMTIuVFC0Tk2/1qgYsdUTRI p1Py4D7hl8hhofPoAuKQTTiKC5taBAUlV1aLNoYG+HG3lZS8QVn6h8aFx JYOY61e22az7YVy2Si3wRG0z6+uVs7lR/1wY6/mhd6ZB0aPHmNuObahaX w==; X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="322782127" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="322782127" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2023 06:52:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="745855975" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="745855975" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 21 Mar 2023 06:52:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4681B4FF; Tue, 21 Mar 2023 15:53:40 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Bartosz Golaszewski Subject: [PATCH v1 2/2] gpiolib: Add gpiochip_set_data() helper Date: Tue, 21 Mar 2023 15:53:32 +0200 Message-Id: <20230321135332.73190-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230321135332.73190-1-andriy.shevchenko@linux.intel.com> References: <20230321135332.73190-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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?1760986748029071396?= X-GMAIL-MSGID: =?utf-8?q?1760986748029071396?= There are too many 'data' parameters here and there. For the better maintenance keep access GPIO device data via getter and setter. Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 2bfc474d99c3..51a19cbe39a4 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -681,6 +681,11 @@ static void gpiochip_setup_devs(void) } } +static void gpiochip_set_data(struct gpio_chip *gc, void *data) +{ + gc->gpiodev->data = data; +} + /** * gpiochip_get_data() - get per-subdriver data for the chip * @gc: GPIO chip @@ -723,7 +728,9 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, gdev->dev.bus = &gpio_bus_type; gdev->dev.parent = gc->parent; gdev->chip = gc; + gc->gpiodev = gdev; + gpiochip_set_data(gc, data); device_set_node(&gdev->dev, gc->fwnode); @@ -790,7 +797,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, } gdev->ngpio = gc->ngpio; - gdev->data = data; spin_lock_irqsave(&gpio_lock, flags); @@ -978,9 +984,9 @@ void gpiochip_remove(struct gpio_chip *gc) gpiochip_free_valid_mask(gc); /* * We accept no more calls into the driver from this point, so - * NULL the driver data pointer + * NULL the driver data pointer. */ - gdev->data = NULL; + gpiochip_set_data(gc, NULL); spin_lock_irqsave(&gpio_lock, flags); for (i = 0; i < gdev->ngpio; i++) {