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 8AB5717AFA7; Sun, 24 Mar 2024 22:40:01 +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=1711320001; cv=none; b=MRRyVdxYCfvEh1xFLElrT42tho6BMwmpKb2AC/nT3pYuq7PBRPQPvcfroiywiwyLJjxEacrZT1SPuYDNzw77iOU6o4h153BX8jebXjyw9eaw8VxYeKsh/mU1MxDJeL5fzfVYSA6SlGwG+hpTMqq/z2I3czVPd9l9K7+P9wriG6w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320001; c=relaxed/simple; bh=5mSPBjLV0u+Pvcr5pGiX6KSIy1OJMNHkJXXHNu0TY4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P2MBQD3ENJyWBHt4qEeXP/NzF2QUSf3aiKl/B1Tu5WrKzHD8oD/abUDVcZ2BU/fuzR3gVcckVw9Xb4Dc9qfbul9AMkdibLC1sp65YoZNWHkFEvwEpY8dgRW1UErp1hIQxfjxvtDOr/ZqOy3fSOXMQRNu1awXsJMwmwWl80NDBEs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f4A1S/wz; 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="f4A1S/wz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE700C433C7; Sun, 24 Mar 2024 22:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320001; bh=5mSPBjLV0u+Pvcr5pGiX6KSIy1OJMNHkJXXHNu0TY4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f4A1S/wz81b76DaVTvl8ngdsuHzE6T+iH56Ijufz+XJXmI8FQbVu+fEO/vRgoxnLx EjDGH1tTim1J1xp0+68oxwEK//hjRzdZ/GFX1iptiUWXLqIEoDxgOqddHLuUmkwvoH 1JjtEg4hrpIZeIWLFk5fzaN8B/WjGdmZE+Q1WGmZWM26VXkeqQ7S0isJg/ygOmkgvA YtM2+LfeMIZ04jq+0wa1Y+NfVzTmOodbDiCyz7vHBNZcIj1sflLtx1hTnZCaRyXWkk N36rmdWooKQ7pwstcwHV72OvV5EaiENa+tLgRg+GDiuFYZxHkmeZqEOD34vnB3a3Y5 KMNiek1wlEwqg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bartosz Golaszewski , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.8 307/715] Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional() Date: Sun, 24 Mar 2024 18:28:06 -0400 Message-ID: <20240324223455.1342824-308-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Bartosz Golaszewski [ Upstream commit 56d074d26c5828773b00b2185dd7e1d08273b8e8 ] The optional variants for the gpiod_get() family of functions return NULL if the GPIO in question is not associated with this device. They return ERR_PTR() on any other error. NULL descriptors are graciously handled by GPIOLIB and can be safely passed to any of the GPIO consumer interfaces as they will return 0 and act as if the function succeeded. If one is using the optional variant, then there's no point in checking for NULL. Fixes: 6845667146a2 ("Bluetooth: hci_qca: Fix NULL vs IS_ERR_OR_NULL check in qca_serdev_probe") Signed-off-by: Bartosz Golaszewski Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_qca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index edd2a81b4d5ed..8a60ad7acd705 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -2326,7 +2326,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); - if (IS_ERR_OR_NULL(qcadev->bt_en) && + if (IS_ERR(qcadev->bt_en) && (data->soc_type == QCA_WCN6750 || data->soc_type == QCA_WCN6855)) { dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n"); @@ -2335,7 +2335,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) qcadev->sw_ctrl = devm_gpiod_get_optional(&serdev->dev, "swctrl", GPIOD_IN); - if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && + if (IS_ERR(qcadev->sw_ctrl) && (data->soc_type == QCA_WCN6750 || data->soc_type == QCA_WCN6855 || data->soc_type == QCA_WCN7850)) @@ -2357,7 +2357,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) default: qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable", GPIOD_OUT_LOW); - if (IS_ERR_OR_NULL(qcadev->bt_en)) { + if (IS_ERR(qcadev->bt_en)) { dev_warn(&serdev->dev, "failed to acquire enable gpio\n"); power_ctrl_enabled = false; } -- 2.43.0