From patchwork Tue Apr 30 07:10:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 13648377 X-Patchwork-Delegate: kw@linux.com 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 9B7E1199AD; Tue, 30 Apr 2024 07:11:06 +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=1714461066; cv=none; b=P4KSWehYgKcVXX308S7noKBvd390rnpcFUndvDF/tdOy0nCPJiec3Cq3dhmo1mcAGYjl0ZB63z0j45hrRGAZHZg85MhGcr9lsIsuOZ5L5WhabNt0Dq2xH2U0HIJvJs+acquWRQp/adiL+aiKZGldQIaU6Vl2MXYurN4roKp6jvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714461066; c=relaxed/simple; bh=MgqqXwmWXlkipmBRIZBSIUTe/3u2BXxchsuk8HMH5Kw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tbf8vzaxExy5vySOzZoQUSsTaE5tA/riL2EpFxLKwAdR26ifLCalAC9byLz8dFILCFJDwySiWksXeSpkgWeHj9KQg+xhFBEW5Zdoax/kxjdgcb48HJPtpESGypakAEH2b6uAYZy6T8NOBYEI5ZEBM0/tUjraYCYPfnqUg4AKZQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GZk8fJQt; 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="GZk8fJQt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41196C2BBFC; Tue, 30 Apr 2024 07:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714461066; bh=MgqqXwmWXlkipmBRIZBSIUTe/3u2BXxchsuk8HMH5Kw=; h=From:To:Cc:Subject:Date:From; b=GZk8fJQtLjDKjMIiWQv6LQaS+sgh75EqSA0N0mTsapqr4OeifkOxICH/knfALhKlD x+xEiLynE/pgH5MezktdWWUDsasdHm4RJbyNWyXTegB7AlnCfna+XBP5NOyk/6oLbf ZPOW5GLVD5ORxVonjF8hbfGMUBqnEPA5TiWk7n04X2aG3PnKfqOUHhIiXgEnbK+FzB ZVxtQIVqEfTmOhMEssQiNP1gRi9SptRE9LgT2t7G9qgoktW3gKuJwBFPxDXEZ88wSq +EFpUKR/bvFMAvsuzf15ReQkSR7HeAgTPDhmSenzd9JzkQH87pbxP3l5D8L3aKQUvp 3Pz1FzQ+AKUAg== From: Niklas Cassel To: Vignesh Raghavendra , Siddharth Vadapalli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas Cc: Niklas Cassel , linux-omap@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] PCI: dra7xx: Fix cpu_addr_fixup parameter name Date: Tue, 30 Apr 2024 09:10:55 +0200 Message-ID: <20240430071054.248008-3-cassel@kernel.org> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1138; i=cassel@kernel.org; h=from:subject; bh=MgqqXwmWXlkipmBRIZBSIUTe/3u2BXxchsuk8HMH5Kw=; b=owGbwMvMwCV2MsVw8cxjvkWMp9WSGNIMZtb5HP742MFmz9NID9eXPw+U7ro/3clenYn5H+/+5 l0HhBkkOkpZGMS4GGTFFFl8f7jsL+52n3Jc8Y4NzBxWJpAhDFycAjCRr9sZ/pedT1mzccmk9VFa 0kkul8508C41FPziUDorYcqyyQ/U6z4y/LPozGKRFJ2nbuhyz+lYkK65aoPPy61rF/TfjLq7XJ/ 1DxsA X-Developer-Key: i=cassel@kernel.org; a=openpgp; fpr=5ADE635C0E631CBBD5BE065A352FE6582ED9B5DA The function pointer declaration for the cpu_addr_fixup() callback uses "cpu_addr" as parameter name. Likewise, the argument that is supplied to the function pointer when the function is actually called is "cpu_addr". Rename the cpu_addr_fixup parameter name to match reality. Signed-off-by: Niklas Cassel --- drivers/pci/controller/dwc/pci-dra7xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c index d2d17d37d3e0..2b818346bb37 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -113,9 +113,9 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset, writel(value, pcie->base + offset); } -static u64 dra7xx_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr) +static u64 dra7xx_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr) { - return pci_addr & DRA7XX_CPU_TO_BUS_ADDR; + return cpu_addr & DRA7XX_CPU_TO_BUS_ADDR; } static int dra7xx_pcie_link_up(struct dw_pcie *pci) From patchwork Tue Apr 30 07:10:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 13648378 X-Patchwork-Delegate: kw@linux.com 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 AFB271C291 for ; Tue, 30 Apr 2024 07:11:11 +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=1714461071; cv=none; b=X0eAK+8Y/bo+ka7QHFDe2kioJW4llo4T+Nd3JHXVFi6DxoDnBbp1T2grvStipplJ9Fjlqpn78+qi5+XlYvMcCGgHvm8hf0xyyOT/RriO5udEBif7sKWRI0LjRNA9c/Qis1fl67rJD+xB9JyAN46GvbNvJVSIIigQ944mrbJiNUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714461071; c=relaxed/simple; bh=b0xYZ9pHla2HGOqalo1ucoxwIxK4fcaev8A2o+7ig/Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eiYzUIFwU8lmpe6Q3WcNrCpv+U3FzE5SfiSM1rsybjvfPj324pQvxKgIfbqulwR9mViCgrdr7edszjXG7SkTdhrrIFSyHvIkY/yad/A7ilJwQ+WJBJsyECNQZOy3d0IkMKZq4bXdp1AYS3rfJBXLNtCDnhNtlf7lqOluUu7D+bM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W9YmfKcW; 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="W9YmfKcW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CD4EC4AF49; Tue, 30 Apr 2024 07:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714461071; bh=b0xYZ9pHla2HGOqalo1ucoxwIxK4fcaev8A2o+7ig/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W9YmfKcWqq8fG4DWHhHo/hAILcoSj2Hg4bKJlFBhXSAO52LwopShJ8jfrhpP7S/DH oE5p8T6U7CCnMH/ax4J/AaGBxhhfpnYCAg3GLXGeSICJY++X3iWU/juZGdngvfzAKj VKTcV8vHQQeQ/dTBDiyeY+97Op5/Vf0y9K9bTkfqxCdVUkFwvThqfbYKOaHN1lm7hl zvSW/8CAfaHNjMVBrdV2AK/TjtdO8WIjJGPvTJXqMZaUNMwyP4MqNBdPyaGRY/Owgd oZrtSLuairqu/KTysa+QqsC4jWz8VrPqKoPCX5sacLOZAdBWFacGVDVb+C9DToUGz+ 27XBGWsURMWJQ== From: Niklas Cassel To: Jesper Nilsson , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas Cc: Niklas Cassel , linux-arm-kernel@axis.com, linux-pci@vger.kernel.org Subject: [PATCH 2/2] PCI: artpec6: Fix cpu_addr_fixup parameter name Date: Tue, 30 Apr 2024 09:10:56 +0200 Message-ID: <20240430071054.248008-4-cassel@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430071054.248008-3-cassel@kernel.org> References: <20240430071054.248008-3-cassel@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1622; i=cassel@kernel.org; h=from:subject; bh=b0xYZ9pHla2HGOqalo1ucoxwIxK4fcaev8A2o+7ig/Q=; b=owGbwMvMwCV2MsVw8cxjvkWMp9WSGNIMZtY17cutVu0IPLbjh7zn54dTdTTMzXROrHQ0Xvt76 uaFGZYXO0pZGMS4GGTFFFl8f7jsL+52n3Jc8Y4NzBxWJpAhDFycAjARTzFGhi1qU5nYbZZ4FFmY aaz+ungLx+ZfEmqVi7tW6rw95OyR68vw3421ys1x28VF34yPbC29pDxTlNPfXnadwWS274+/Pnv zhhMA X-Developer-Key: i=cassel@kernel.org; a=openpgp; fpr=5ADE635C0E631CBBD5BE065A352FE6582ED9B5DA The function pointer declaration for the cpu_addr_fixup() callback uses "cpu_addr" as parameter name. Likewise, the argument that is supplied to the function pointer when the function is actually called is "cpu_addr". Rename the cpu_addr_fixup parameter name to match reality. Signed-off-by: Niklas Cassel Acked-by: Jesper Nilsson --- drivers/pci/controller/dwc/pcie-artpec6.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c index a4630b92489b..65cbb267881d 100644 --- a/drivers/pci/controller/dwc/pcie-artpec6.c +++ b/drivers/pci/controller/dwc/pcie-artpec6.c @@ -94,7 +94,7 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u regmap_write(artpec6_pcie->regmap, offset, val); } -static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr) +static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 cpu_addr) { struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pci); struct dw_pcie_rp *pp = &pci->pp; @@ -102,13 +102,13 @@ static u64 artpec6_pcie_cpu_addr_fixup(struct dw_pcie *pci, u64 pci_addr) switch (artpec6_pcie->mode) { case DW_PCIE_RC_TYPE: - return pci_addr - pp->cfg0_base; + return cpu_addr - pp->cfg0_base; case DW_PCIE_EP_TYPE: - return pci_addr - ep->phys_base; + return cpu_addr - ep->phys_base; default: dev_err(pci->dev, "UNKNOWN device type\n"); } - return pci_addr; + return cpu_addr; } static int artpec6_pcie_establish_link(struct dw_pcie *pci)