Commit dbf0b9ba authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/artpec6' 

- Remove surplus break statement and local code block (Krzysztof
  Wilczyński)

* pci/artpec6:
  PCI: artpec6: Remove local code block from switch statement
  PCI: artpec6: Remove surplus break statement after return
parents 739c4747 30492c12

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

+2 −5
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	const struct artpec_pcie_of_data *data;

	enum artpec_pcie_variants variant;

	enum dw_pcie_device_mode mode;

	u32 val;



	match = of_match_device(artpec6_pcie_of_match, dev);

	if (!match)
@@ -432,9 +433,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
		if (ret < 0)

			return ret;

		break;

	case DW_PCIE_EP_TYPE: {

		u32 val;



	case DW_PCIE_EP_TYPE:

		if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_EP))

			return -ENODEV;
@@ -445,8 +444,6 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
		pci->ep.ops = &pcie_ep_ops;



		return dw_pcie_ep_init(&pci->ep);

		break;

	}

	default:

		dev_err(dev, "INVALID device type %d\n", artpec6_pcie->mode);

	}