From patchwork Tue Oct 1 21:27:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1991726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=a8V8Xr8N; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-gpio+bounces-10662-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XJ9yF72CMz1xsq for ; Wed, 2 Oct 2024 07:27:33 +1000 (AEST) 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 33DEF284EF2 for ; Tue, 1 Oct 2024 21:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 79F601CDA20; Tue, 1 Oct 2024 21:27:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a8V8Xr8N" X-Original-To: linux-gpio@vger.kernel.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 06DFC322E; Tue, 1 Oct 2024 21:27:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727818048; cv=none; b=pOPr1fq3QtgMY4Jvz+bny8p6Xy0eYdNJnk7uCDbUhn+MrkWbiDAfl2LyePa/gzNtY0N1z8y/iqJZrlyJzWNlSdaggc9/fD5ds0ykCjk5IU4y/Zy2Cfgnf4R0oJBAqGse6qeFrPjy9Znrz3Jnj0AFTGK2IgSy6l3qqVdwy3p2u60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727818048; c=relaxed/simple; bh=6BJzA92DUG+O6xuNwb5m4dK6PPn25FEwaFk2MLI7+0Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=d9bc6Avt8K7ELsVtSrXZBlEBLRv+41x5kQlFfmn3knyZ2dQWas3IgReogzWumcUAp3WzNU2rR31ZdUP8RenTN6zEZtEsCnBn7jqVHGtnAIMcHHhpc3bzPsUP7eusfsKcj5wkNhXtn+tQGiVotrZHtP4HZLSITtPEqtXnbb+YQEc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a8V8Xr8N; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-718d91eef2eso171984b3a.1; Tue, 01 Oct 2024 14:27:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727818046; x=1728422846; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=LQca9DR91ltbBlGQg8xftox/shScBvpsoAMjaXf9zJE=; b=a8V8Xr8N6/qiFFNTkpSjW+fYIuXlSjf9llfYIfqEIATUFLwOZnBhJiZQEEwpApwINq Wl7uGLkbesYjE339N6t+hSiofYyMkIh+G15z88S4WESkLVDPYi2aHr+WDn8etEIex8F4 venRiIiqS427+onWWK5cBcvTTLzAiDTTdsMLH+D4lRYLnof/sJT4pU0ri7/kr8oRttjj CCQUApDVhpDp+ZrxNTGpVD/JswoCu/83iGIL4b1cpktm2EluFybd+9EOEK6La4HNUTbI vG3RvWUyrdgHuuR7nHj5Ix7Vbt+usUsnWRUQKDIJBZ4hBW5+7hmFjU4FwEOpKIycEO2X citA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727818046; x=1728422846; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LQca9DR91ltbBlGQg8xftox/shScBvpsoAMjaXf9zJE=; b=PXU7hGgG6CgbbQvliUuxto1Yh1PVcI2NKQk+ZwoZzpwcjIe86inYewXpdYfIOsRSPH gFCjqdJpcymndFpX8ZduRiAkRFpDudSltOv09gLQfpdxxm2aKtddlVMXEOjK3J3xc6BV Sq3K5fI3AhDdtdx9hYWJeAG/UJ1IYijNoUuMWVVz9dSUfa2nUho/Fu/epfWZ+F+hIbWB szF6CbmXvHjrlluI6Y5Jr1YDPJ2xdysPyxEP6EB1UDQi9gIMwI51sNQRurWBW7JDD8bp 2m7lf5JIIL16c+493IMeEXpgJn9Ytz+OuDzGObgU9fqjpO+6M7PHyrCJpe43WLT4s8Ft baQQ== X-Forwarded-Encrypted: i=1; AJvYcCUncwDonqEnqih6vEa687WfYNflnP/ZLbw0zY2ajHqEHi6r0VJ2c+//kgVuz51QptDubgLbvpxcW8LnToU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx7O8q7l8YdXS+G/eCFTXDAi/vKn7vi9OdSWLayUAXX7MmlTVv f7L1ZGq5tJ2ten0Frf7n5DCe5yI4ocfbO3EpAyu9cc8tAbBRS4Tb/ry6uPli X-Google-Smtp-Source: AGHT+IFMVAvq+6O3pjPa5fuBOmkAFnt5kV4DDCKh29ainEwH8OC8LUCT+15mHJDzgrNbdz3PmbBQpA== X-Received: by 2002:a05:6a00:1794:b0:71c:722f:8298 with SMTP id d2e1a72fcca58-71dc6020e52mr1681051b3a.8.1727818045996; Tue, 01 Oct 2024 14:27:25 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b26518a2asm8572942b3a.107.2024.10.01.14.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 14:27:25 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] pinctrl: aw9523: add missing mutex_destroy Date: Tue, 1 Oct 2024 14:27:22 -0700 Message-ID: <20241001212724.309320-1-rosenp@gmail.com> X-Mailer: git-send-email 2.46.2 Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Otherwise the mutex remains after a failed kzalloc. Signed-off-by: Rosen Penev --- drivers/pinctrl/pinctrl-aw9523.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-aw9523.c b/drivers/pinctrl/pinctrl-aw9523.c index b5e1c467625b..1374f30166bc 100644 --- a/drivers/pinctrl/pinctrl-aw9523.c +++ b/drivers/pinctrl/pinctrl-aw9523.c @@ -987,8 +987,10 @@ static int aw9523_probe(struct i2c_client *client) lockdep_set_subclass(&awi->i2c_lock, i2c_adapter_depth(client->adapter)); pdesc = devm_kzalloc(dev, sizeof(*pdesc), GFP_KERNEL); - if (!pdesc) - return -ENOMEM; + if (!pdesc) { + ret = -ENOMEM; + goto err_disable_vregs; + } ret = aw9523_hw_init(awi); if (ret) From patchwork Tue Oct 1 21:27:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 1991727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=P7J1oZMq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-gpio+bounces-10663-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XJ9yQ1bwpz1xsq for ; Wed, 2 Oct 2024 07:27:42 +1000 (AEST) 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 4EF241F21BF9 for ; Tue, 1 Oct 2024 21:27:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A19F71CEAB8; Tue, 1 Oct 2024 21:27:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P7J1oZMq" X-Original-To: linux-gpio@vger.kernel.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 0F9AB1CB32B; Tue, 1 Oct 2024 21:27:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727818049; cv=none; b=HlzWnmnhUI+4N+1bpgxMBoA9e2zW6dIcEoJQFOwZPgDWdehFiTXkONKfi6kNOq4zxnH+HHxDF6xQMjj8QxJSX/PuL3BCD8R9XbSM9UqeD5Bz+gRmYC9ZJV/JVVphTIPj2FtiB/gmIO9nK31WIYj6c5Ybw/wWsHtiiCy9ADLWdcw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727818049; c=relaxed/simple; bh=scTDVUvA/rAFRAPo8zuycsCH9pRkxowhE/xKnrp4qr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H6HCTETJD0eXs9Yj+nxapEZLdmxLGIK7z8nRBVOTsK/v6oiRTrgRPlEC6bbMiQR7Hv0jIIw37zVq93MSN8cyDwInlmRZL64yT1iHi1pNxwtg0A5h6b952xosXBKl1fhfcI0v+lo6GiMmMua+lFMJm4xLF8RG0OTY5ksPS/2A0Rw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P7J1oZMq; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-71b00a97734so5246047b3a.1; Tue, 01 Oct 2024 14:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727818047; x=1728422847; 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=jzxw5fwHbnGXcVSgJzdzHGpw2sYpxV4QeEDmtY/DZjQ=; b=P7J1oZMqt+mtIiaKMk7nIDmrBb6VgbPJskO/PQ1Zgt3t7nKSmspx/hHKzKLfNebvs6 WcWw1oopjtGFPvdDtu1/R1TwQpKKOAP7zb2vM/+jyPeMfAqp11ebnyHfFNdH9dX53zk6 asfYhAVyJk95wwsv6tS1tPr6gJaDN44W1qVt2/1bQOUbesssJm/Iu7rubiNx14wmv9pm Gu87c/DanKHrlX8nLhcSHPXyIJCXSELT6xCodfk99QBwq3Oo+NRvvcHEkyCYBwKgj/Is dbVK0yIKSOb3WkK0ehRsEHUoxCyDUBZg7bGxk08MRuMf7WcOE1LEhVHhC2dMlIma/rPk FCYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727818047; x=1728422847; 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=jzxw5fwHbnGXcVSgJzdzHGpw2sYpxV4QeEDmtY/DZjQ=; b=dDq+QNNTSkzf6FVANqT0QyM3+0XASctxuphAuPPH0WAKnizfEwkeun3kCmUExDjNj2 ZJenvXILiB1sZPtWoA00gDxh1fDm6EPGxjmoqPqtkKyhL8Zo/gYel5tIpfzua+TBZv3G 73Bob7DJ+8qBuKXdGf9Rz7zenPNE6PVx+0fc41Wu+5URioL/b7xgCb6kt0Lk+c6hosgy zcqtNVKI3CLeFSndrieVRzF1Wd2pYhYmQxuonpHYU0kRWiATqGdaRUXWjHZa6VHUkHOM Vyky5jSoIlk9arvNvDVttXhrF1a4jj1TIuLKRL79YiJrQvdH3H9oXeneRuFxFtHJgFXV mGMg== X-Forwarded-Encrypted: i=1; AJvYcCVRr1xP/iBImF/5IBkKTqAFdQxiSTy5AYbQ38/lmYVRvf1kSBjwFn+/c1we2nxYB10h/nBBgyg2SGUeUlI=@vger.kernel.org X-Gm-Message-State: AOJu0YzDF+DA9SDid3qjBu54ZJEzEbjgCHW2Ikz7wBhDGiLfN5zX2oK8 Qhu5vO7d9h7fHQrGlTFzOSlGq9P6qsvh/82gCz5tC5OlRWx3axziSQg0LE66 X-Google-Smtp-Source: AGHT+IEQQtcVTM1iN3N0gdTD5GjhvHNC4tKTAXWbV6Rz2mnTSTo38XEmUBPs9klO4aPxQx2ttL2hVQ== X-Received: by 2002:a05:6a21:174b:b0:1cf:6953:2872 with SMTP id adf61e73a8af0-1d5e2d2a89fmr1523779637.48.1727818047176; Tue, 01 Oct 2024 14:27:27 -0700 (PDT) Received: from ryzen.lan ([2601:644:8200:dab8::a86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b26518a2asm8572942b3a.107.2024.10.01.14.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 14:27:26 -0700 (PDT) From: Rosen Penev To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] pinctrl: aw9523: use enable for regulator Date: Tue, 1 Oct 2024 14:27:23 -0700 Message-ID: <20241001212724.309320-2-rosenp@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241001212724.309320-1-rosenp@gmail.com> References: <20241001212724.309320-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 devm_regulator_get_enable_optional can be used to simplify the logic here. Signed-off-by: Rosen Penev --- drivers/pinctrl/pinctrl-aw9523.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/pinctrl/pinctrl-aw9523.c b/drivers/pinctrl/pinctrl-aw9523.c index 1374f30166bc..cf2fb26992b4 100644 --- a/drivers/pinctrl/pinctrl-aw9523.c +++ b/drivers/pinctrl/pinctrl-aw9523.c @@ -80,7 +80,7 @@ struct aw9523 { struct regmap *regmap; struct mutex i2c_lock; struct gpio_desc *reset_gpio; - struct regulator *vio_vreg; + int vio_vreg; struct pinctrl_dev *pctl; struct gpio_chip gpio; struct aw9523_irq *irq; @@ -972,16 +972,9 @@ static int aw9523_probe(struct i2c_client *client) if (IS_ERR(awi->regmap)) return PTR_ERR(awi->regmap); - awi->vio_vreg = devm_regulator_get_optional(dev, "vio"); - if (IS_ERR(awi->vio_vreg)) { - if (PTR_ERR(awi->vio_vreg) == -EPROBE_DEFER) - return -EPROBE_DEFER; - awi->vio_vreg = NULL; - } else { - ret = regulator_enable(awi->vio_vreg); - if (ret) - return ret; - } + awi->vio_vreg = devm_regulator_get_enable_optional(dev, "vio"); + if (awi->vio_vreg && awi->vio_vreg != -ENODEV) + return awi->vio_vreg; mutex_init(&awi->i2c_lock); lockdep_set_subclass(&awi->i2c_lock, i2c_adapter_depth(client->adapter)); @@ -1027,8 +1020,6 @@ static int aw9523_probe(struct i2c_client *client) return ret; err_disable_vregs: - if (awi->vio_vreg) - regulator_disable(awi->vio_vreg); mutex_destroy(&awi->i2c_lock); return ret; } @@ -1043,9 +1034,7 @@ static void aw9523_remove(struct i2c_client *client) * set the pins to hardware defaults before removing the driver * to leave it in a clean, safe and predictable state. */ - if (awi->vio_vreg) { - regulator_disable(awi->vio_vreg); - } else { + if (awi->vio_vreg == -ENODEV) { mutex_lock(&awi->i2c_lock); aw9523_hw_init(awi); mutex_unlock(&awi->i2c_lock);