From patchwork Fri Dec 15 15:52:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 179391 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9375259dys; Fri, 15 Dec 2023 07:53:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFjIf8GwYvaBTzHJt+FRcmS2t3uatbPJN3kHpq/SsGh+m8KrXDeulT3T2g/uLkEAyqkuiRp X-Received: by 2002:a17:906:30d5:b0:a1c:d8c6:c21 with SMTP id b21-20020a17090630d500b00a1cd8c60c21mr12018228ejb.67.1702655629193; Fri, 15 Dec 2023 07:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702655629; cv=none; d=google.com; s=arc-20160816; b=p/8iqXDlYIGc2bkdcM/Xwh8IJ7ldhHIING7XjxAqhx7iBSS/+i13hg3EI6uUM+FNw5 6eUwx2smLW5LC0cmAhz+3S30NsNL1yzxCU0n9cjVbqX4jkPmwGRj2PGnAakzHK8ZdPDB Ztg5dM1WI4w4fxPmxn5jsqdyQg97ghJK5uUd8Vp4I/yBcw4YaOq3FpIDbQRUM2O0mMj0 hDwGvIwP1/szmFMsv9oxbfKd3O2tZKUm9NuiZdCGhMkEp7IviGI8ooOK8BtEDboAQb5a bIR78YcxOXXk99bMiWGYaVi/7wH75TTlYVTCWVNJFRIZY06COzFP3e1SJJeAyy/y5Pgz XiiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ap5YKACnlUbXS6eetDez0VUaGPWZc+QwWEfEjI6SZuQ=; fh=u8rLQsUjk/DQ68o09SM+wx8FxqDFcT3zeQdKot9Eyy4=; b=0Z5VpOAQ6a2T9K4IAjh9Y5oFngpyrEBCV6+T5h/ntbgbzPJfo5ZEdSPEBlyMfRYBI4 G/PHAskLxr/igEfUnqc1TzUh6K4+KClncY2NwWw7vmOp9gOR/g+RYYdC3BroeGZaOFTb Q5wpg1fTqGZYTDwnXqxft27pdXvLbMU4FtIYOm5Y1RDmuq5VOhJ1reSYOqmytiTeXpCf RDoU3FXnJyxu/t64+ICrwifIEToJd8tQzjhzIpl5h8ys1QKUAeBysjuiIS18Jl5d2v38 1O081m724OCvCaypoX+uckqw7v1z/qoGx4C3+6iV1Px7pSqfcvCHkBXNwmCV+7ZxEGGk v3lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=3B3hjoiy; spf=pass (google.com: domain of linux-kernel+bounces-1235-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1235-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id m10-20020a1709066d0a00b00a1a64319aa8si7580139ejr.510.2023.12.15.07.53.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 07:53:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1235-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=3B3hjoiy; spf=pass (google.com: domain of linux-kernel+bounces-1235-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1235-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id CAE2D1F23C3C for ; Fri, 15 Dec 2023 15:53:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 06BD83BB4E; Fri, 15 Dec 2023 15:53:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="3B3hjoiy" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC4B4381BB for ; Fri, 15 Dec 2023 15:53:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40c38e292c8so4611005e9.0 for ; Fri, 15 Dec 2023 07:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1702655586; x=1703260386; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ap5YKACnlUbXS6eetDez0VUaGPWZc+QwWEfEjI6SZuQ=; b=3B3hjoiyG4DVgpHA4+wXSmF6nRAJxitREHTvJCqkLiQTINL8x1wPMpVQq72pFMQsvp VbRU7hpIdOCog6/zXv2kV1fO5eZUZP46D0OonH/mxY9sk6X6QCm4EiaN7DbzQmmn3h1q ZuLuiH29Lc0cfDzGjIHxy1Ce+CKnr7ks8Q4uvAwUORpB4Md2RpEMbGVHrnQvXBRazXNr JsQ39BluYyrr/lC0L0XKCtbhDCN8r3MlOF9UfMGwFbj3mgJrqpEMXFjSImKRhsh7h2lN LR7Mx0cANYBtW35d9hMXqwGR8KDpsltNcxoEtrQDDm0ahPIOW64cPM3xCNwedkjChvd0 tITA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702655586; x=1703260386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ap5YKACnlUbXS6eetDez0VUaGPWZc+QwWEfEjI6SZuQ=; b=fjxfkoNM1Qmar9FoOdjbxkMLhgSDeH/DS1rC434297pgIp+jifh5EP4GIdWpbz9f3w OQibpm57BGoEFz/zEW8T1CePXupZNTZdn8WWumyKyq2YUR5fzC0xMOL2k++CFfTud+7H 6I4vvUZHn7/wItdPpqHz+u0LgblZhfW27Gw+STOmAz2OUbZ9ym82rW+ZPOYqHWBT1B9M nB/t1nG/1tQsX1c+wgGOiKPrRfXaZAmiTMpLnDeVBhrtHMIj8i9gGMf+/E5/7sZHK0TM xseM25/HbiOqaLKNXCyRsSqO/6rfKWHeKqRZjYXv1qTFVJ/+AUSZnYJGQB0N4TM6Iq3y Vodw== X-Gm-Message-State: AOJu0YwSnJXt0FaWGABgMf2RqDRBoRvTSgT+9qQ30xGKfHmORm9Jtpfd G4JCYAPUXlFiiZ5uXm8FFI83Vw== X-Received: by 2002:a05:600c:16c9:b0:40c:3dd7:98d9 with SMTP id l9-20020a05600c16c900b0040c3dd798d9mr5620884wmn.21.1702655585948; Fri, 15 Dec 2023 07:53:05 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:8672:e2c5:37d9:3743]) by smtp.gmail.com with ESMTPSA id bg22-20020a05600c3c9600b0040c6ab53cd2sm3110484wmb.10.2023.12.15.07.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 07:53:05 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko , Kent Gibson Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 1/2] gpiolib: rename static functions that are called with the lock taken Date: Fri, 15 Dec 2023 16:52:59 +0100 Message-Id: <20231215155300.21186-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231215155300.21186-1-brgl@bgdev.pl> References: <20231215155300.21186-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785363828665453027 X-GMAIL-MSGID: 1785363828665453027 From: Bartosz Golaszewski Rename two functions that read or modify the global GPIO device list but don't take the lock themselves (and need to be called with it already acquired). Use the _unlocked() suffix which seems to be used quite consistently across the kernel despite there also existing the _locked() suffix for the same purpose. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/gpio/gpiolib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 6efe44570333..5b744d1f31f6 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -290,7 +290,7 @@ struct gpio_chip *gpio_device_get_chip(struct gpio_device *gdev) EXPORT_SYMBOL_GPL(gpio_device_get_chip); /* dynamic allocation of GPIOs, e.g. on a hotplugged device */ -static int gpiochip_find_base(int ngpio) +static int gpiochip_find_base_unlocked(int ngpio) { struct gpio_device *gdev; int base = GPIO_DYNAMIC_BASE; @@ -363,7 +363,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_direction); * Return -EBUSY if the new chip overlaps with some other chip's integer * space. */ -static int gpiodev_add_to_list(struct gpio_device *gdev) +static int gpiodev_add_to_list_unlocked(struct gpio_device *gdev) { struct gpio_device *prev, *next; @@ -907,7 +907,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, */ base = gc->base; if (base < 0) { - base = gpiochip_find_base(gc->ngpio); + base = gpiochip_find_base_unlocked(gc->ngpio); if (base < 0) { spin_unlock_irqrestore(&gpio_lock, flags); ret = base; @@ -927,7 +927,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, } gdev->base = base; - ret = gpiodev_add_to_list(gdev); + ret = gpiodev_add_to_list_unlocked(gdev); if (ret) { spin_unlock_irqrestore(&gpio_lock, flags); chip_err(gc, "GPIO integer space overlap, cannot add chip\n");