From patchwork Wed Sep 28 15:54:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 12992435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E20CC32771 for ; Wed, 28 Sep 2022 15:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234166AbiI1PzR (ORCPT ); Wed, 28 Sep 2022 11:55:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234141AbiI1PzO (ORCPT ); Wed, 28 Sep 2022 11:55:14 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB6958768C; Wed, 28 Sep 2022 08:55:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id ABD52CE1EE1; Wed, 28 Sep 2022 15:55:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E1E5C433D7; Wed, 28 Sep 2022 15:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664380506; bh=snbCPFGK77lLhaoBKaG+W4txsXWhqgoJg/DwQu1/7Wo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s8gBCOaI21XKWOE/s/fW03R9iL7ZdL05MNVEePYa0Bu9sb9edsJyjOsG+WD3Q8oAH mk7LycDvNYKwN2ezN4MygIzEOhcmdD01tmdawLuQS+Z7c9cNY0rzXomGLCMuyHDwj0 yZIzc8qMP/ukh/Bqd5oKx1oSawGLeWnfsaCIRAmDl6CH/e9kh1Dhtqj6zKnivZKtuU lUeyHL3kbgLY0IHT2XrkhTibqho+K9WFL41SvthXCSRfLeqTK9PuDzes4e/cXXOzup WCuOCZmot2KMFROEp2H/mUK06Wwa4WHrZwy9qB1TvDe1/v9VXX5onvtRv7aHt+4qTK CFCQe5hJugzGg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1odZOy-0005e8-Q2; Wed, 28 Sep 2022 17:55:12 +0200 From: Johan Hovold To: Lorenzo Pieralisi , Stanimir Varbanov Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 1/2] PCI: qcom: Drop unused post_deinit callback Date: Wed, 28 Sep 2022 17:54:20 +0200 Message-Id: <20220928155421.21660-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928155421.21660-1-johan+linaro@kernel.org> References: <20220928155421.21660-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Drop the unused and confusingly named post_deinit callback that was added for the now removed pipe clock handling. If ever needed we can add back a callback named pre_deinit (or perhaps rather pre_phy_power_off) instead. Signed-off-by: Johan Hovold --- drivers/pci/controller/dwc/pcie-qcom.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 39ca06ffe614..8d6df0db4ebb 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -208,7 +208,6 @@ struct qcom_pcie_ops { int (*init)(struct qcom_pcie *pcie); int (*post_init)(struct qcom_pcie *pcie); void (*deinit)(struct qcom_pcie *pcie); - void (*post_deinit)(struct qcom_pcie *pcie); void (*ltssm_enable)(struct qcom_pcie *pcie); int (*config_sid)(struct qcom_pcie *pcie); }; @@ -1520,8 +1519,6 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp) err: qcom_ep_reset_assert(pcie); - if (pcie->cfg->ops->post_deinit) - pcie->cfg->ops->post_deinit(pcie); err_disable_phy: phy_power_off(pcie->phy); err_deinit: From patchwork Wed Sep 28 15:54:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 12992434 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADA10C6FA90 for ; Wed, 28 Sep 2022 15:55:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234185AbiI1PzP (ORCPT ); Wed, 28 Sep 2022 11:55:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234084AbiI1PzK (ORCPT ); Wed, 28 Sep 2022 11:55:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C025075CFE; Wed, 28 Sep 2022 08:55:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 81166B82118; Wed, 28 Sep 2022 15:55:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24AC4C433C1; Wed, 28 Sep 2022 15:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664380506; bh=19kRek0Nz/9dwB2Md/XXV+wwHSf8yk35FNl7Vooy73E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WAFJ9lBYsnTSpIwaiRaxIPRbLW1l2YWc8XmwdFpYAgA3Pm/qSOYKqhsiTGegfSBc4 nCCXulw0M3rA6zJ2ZpPwXs+rd3AHzdmzHIYn8TpQ9309JgLTsZYTLOesvoynC1rUCt MYTb4nmRizlLpF+cizq1c27mC9lXY8qDlS49GTbrk2l7u28yhWqUNXo+lBw4zu4O0y M8pua8XkBVPTrUBDuHrh8XYKG13rn7EVlLnBEtVgcZmlIzM62h5yGMdXT7UNoYzxPk /rFpKm6ehQf2qWVv0qO1TK6XPcTlsTXR8L+9E6nypMCmQw4yinEDvTYl3gewvUClfv XGXdJNRzoJAag== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1odZOy-0005eA-Sw; Wed, 28 Sep 2022 17:55:12 +0200 From: Johan Hovold To: Lorenzo Pieralisi , Stanimir Varbanov Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v3 2/2] PCI: qcom: Rename host-init error label Date: Wed, 28 Sep 2022 17:54:21 +0200 Message-Id: <20220928155421.21660-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220928155421.21660-1-johan+linaro@kernel.org> References: <20220928155421.21660-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Use a more descriptive name for the reset host-init error label for consistency. Signed-off-by: Johan Hovold --- drivers/pci/controller/dwc/pcie-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 8d6df0db4ebb..f711acacaeaf 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1512,12 +1512,12 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp) if (pcie->cfg->ops->config_sid) { ret = pcie->cfg->ops->config_sid(pcie); if (ret) - goto err; + goto err_assert_reset; } return 0; -err: +err_assert_reset: qcom_ep_reset_assert(pcie); err_disable_phy: phy_power_off(pcie->phy);