Commit 60a4352f authored by Serge Semin's avatar Serge Semin Committed by Bjorn Helgaas
Browse files

PCI: dwc: Organize local variable usage 

There are several places in the common DW PCIe code with incoherent local
variable usage: a variable is defined and initialized with a structure
field, but the structure pointer is dereferenced to access that field
anyway; the local variable is defined and initialized but either used just
once or not used afterwards in the main part of the subsequent method.  It
mainly concerns the pcie_port.dev field. Fix that in the relevant places.

Link: https://lore.kernel.org/r/20220624143428.8334-12-Sergey.Semin@baikalelectronics.ru


Signed-off-by: default avatarSerge Semin <Sergey.Semin@baikalelectronics.ru>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
parent 3869e9a3

drivers/pci/controller/dwc/pcie-designware-host.c

+5 −5
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	struct resource *cfg_res;

	int ret;



	raw_spin_lock_init(&pci->pp.lock);

	raw_spin_lock_init(&pp->lock);



	cfg_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");

	if (cfg_res) {
@@ -388,15 +388,15 @@ int dw_pcie_host_init(struct pcie_port *pp) 
							    dw_chained_msi_isr,

							    pp);



			ret = dma_set_mask(pci->dev, DMA_BIT_MASK(32));

			ret = dma_set_mask(dev, DMA_BIT_MASK(32));

			if (ret)

				dev_warn(pci->dev, "Failed to set DMA mask to 32-bit. Devices with only 32-bit MSI support may not work properly\n");

				dev_warn(dev, "Failed to set DMA mask to 32-bit. Devices with only 32-bit MSI support may not work properly\n");



			pp->msi_data = dma_map_single_attrs(pci->dev, &pp->msi_msg,

			pp->msi_data = dma_map_single_attrs(dev, &pp->msi_msg,

						      sizeof(pp->msi_msg),

						      DMA_FROM_DEVICE,

						      DMA_ATTR_SKIP_CPU_SYNC);

			ret = dma_mapping_error(pci->dev, pp->msi_data);

			ret = dma_mapping_error(dev, pp->msi_data);

			if (ret) {

				dev_err(pci->dev, "Failed to map MSI data\n");

				pp->msi_data = 0;

drivers/pci/controller/dwc/pcie-designware.c

+3 −5
Original line number Diff line number Diff line
@@ -677,8 +677,7 @@ static void dw_pcie_iatu_detect_regions(struct dw_pcie *pci) 


void dw_pcie_iatu_detect(struct dw_pcie *pci)

{

	struct device *dev = pci->dev;

	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(pci->dev);



	pci->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pci);

	if (pci->iatu_unroll_enabled) {
@@ -687,7 +686,7 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci) 
				platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");

			if (res) {

				pci->atu_size = resource_size(res);

				pci->atu_base = devm_ioremap_resource(dev, res);

				pci->atu_base = devm_ioremap_resource(pci->dev, res);

			}

			if (!pci->atu_base || IS_ERR(pci->atu_base))

				pci->atu_base = pci->dbi_base + DEFAULT_DBI_ATU_OFFSET;
@@ -711,9 +710,8 @@ void dw_pcie_iatu_detect(struct dw_pcie *pci) 


void dw_pcie_setup(struct dw_pcie *pci)

{

	struct device_node *np = pci->dev->of_node;

	u32 val;

	struct device *dev = pci->dev;

	struct device_node *np = dev->of_node;



	if (pci->link_gen > 0)

		dw_pcie_link_set_max_speed(pci, pci->link_gen);