From patchwork Wed Jun 29 14:41:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 585872 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 4B34BC433EF for ; Wed, 29 Jun 2022 14:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233701AbiF2Omx (ORCPT ); Wed, 29 Jun 2022 10:42:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233693AbiF2Omv (ORCPT ); Wed, 29 Jun 2022 10:42:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9ED5E39148; Wed, 29 Jun 2022 07:42:50 -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 629C1B821D1; Wed, 29 Jun 2022 14:42:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AB3CC385A5; Wed, 29 Jun 2022 14:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656513768; bh=n9ZmQ6x2qPrMGIXbPtlayfptIXt0o9THHH95LquL13c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fYETopM8meokBgTHEA5w58kW3E/y0/CbROzg1i+aXHVIqtEHLFy1wIwtWwJWgFgZK NuQgS0WTMN8d8eeB3mi4rbaz7w4KhnpfmDFa7L0KggyNCmFpgru2W7bvbiZwT2aYQ9 RYRkHZjUhWmqmlCIrrWEqnQfsByvIYvQ0+h2/a489qLpRGUhWCf7394lPlV8cbAdRI /jBsp45m3/C4a0eYEbQAqC116oIVFAsvquVn+URlsO9oHRG+Vlo1heWMISO8UjFUMF O1HPZxVM+TgDxamwtsbt3arGEvIIjgWRkkax8KwPX1/z97r0/jpZEu2JmNfBz5bMf5 bocv/0uaoKB9w== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1o6Ytz-00058V-Nk; Wed, 29 Jun 2022 16:42:47 +0200 From: Johan Hovold To: Bjorn Helgaas , Lorenzo Pieralisi Cc: Rob Herring , Stanimir Varbanov , Andy Gross , Bjorn Andersson , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 1/2] PCI: qcom: Drop unused post_deinit callback Date: Wed, 29 Jun 2022 16:41:23 +0200 Message-Id: <20220629144124.19693-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220629144124.19693-1-johan+linaro@kernel.org> References: <20220629144124.19693-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 093f4d4bc15d..c5e60f8c565d 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -182,7 +182,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); }; @@ -1353,8 +1352,6 @@ static int qcom_pcie_host_init(struct pcie_port *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: @@ -1366,8 +1363,6 @@ static int qcom_pcie_host_init(struct pcie_port *pp) static void qcom_pcie_host_deinit(struct qcom_pcie *pcie) { qcom_ep_reset_assert(pcie); - if (pcie->cfg->ops->post_deinit) - pcie->cfg->ops->post_deinit(pcie); phy_power_off(pcie->phy); pcie->cfg->ops->deinit(pcie); } From patchwork Wed Jun 29 14:41:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 586591 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 3F150CCA485 for ; Wed, 29 Jun 2022 14:42:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233632AbiF2Omv (ORCPT ); Wed, 29 Jun 2022 10:42:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230192AbiF2Omt (ORCPT ); Wed, 29 Jun 2022 10:42:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1945A3A1AD; Wed, 29 Jun 2022 07:42:49 -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 dfw.source.kernel.org (Postfix) with ESMTPS id ACCA261F48; Wed, 29 Jun 2022 14:42:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 065E6C341CB; Wed, 29 Jun 2022 14:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656513768; bh=e0/+toNpTdyz3yvvEA1CAPOw+ZoKsBqs7s7Gcj0cGps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZbBgy1z7clhDff2k11cQNDfpk9iPtv98d5nlWMmwF5Y0NudSOAcjI5NfzCBqyB8kF khIQqQHO8U2GrfYFWni6JWoPisgLSK38IU6llz4pvy3wxYsrc/yHa1otRuJ4QD2CrQ ZrfIOnwc2wLq0PXAaoJCNPysPqecn7UET5S/aMAYaqCOo0LbRwTf8vEB3rRS3J5DbI Cd+cCbwZAxUWkN9a8wJNNK7KawZP4LkYI8X6VWGys2aOn5dY0EeOB9ZGEwS6Q5Uj3v rvOX15WJdZfebuBMHawv6IJ3JW3XJIZfoTUhGf84+0+GwWLGrw83TcaKJfFgrJxOFS jjFOvh5g+KBnQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1o6Ytz-00058X-QW; Wed, 29 Jun 2022 16:42:47 +0200 From: Johan Hovold To: Bjorn Helgaas , Lorenzo Pieralisi Cc: Rob Herring , Stanimir Varbanov , Andy Gross , Bjorn Andersson , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Dmitry Baryshkov , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 2/2] PCI: qcom: Rename host-init error label Date: Wed, 29 Jun 2022 16:41:24 +0200 Message-Id: <20220629144124.19693-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220629144124.19693-1-johan+linaro@kernel.org> References: <20220629144124.19693-1-johan+linaro@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 c5e60f8c565d..7a5d15b2cff8 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1345,12 +1345,12 @@ static int qcom_pcie_host_init(struct pcie_port *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);