Skip to contentSkip to conversation

PCI: artpec6: Remove surplus break statement after return

PATCH Applied Krzysztof Wilczyński 3 participants 5 messages Jul 1, 2021 – Jul 23, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 PCI: artpec6: Remove surplus break statement after return

As part of code refactoring completed in the commit a0fd361db8e5 ("PCI:
dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code") the function artpec6_add_pcie_ep() has been removed and the call to the dw_pcie_ep_init() has been moved into artpec6_pcie_probe().

This change left a break statement behind that is not needed any more as as the function artpec6_pcie_probe() return immediately after making a call to dw_pcie_ep_init().

Thus remove this surplus break statement that became a dead code.

---
 drivers/pci/controller/dwc/pcie-artpec6.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pci/controller/dwc/pcie-artpec6.c +0 -1
index 597c282f586c..739871bece75 100644
@@ -445,7 +445,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);
Signature · 1 line
2.32.0
#1 lore raw

PATCH v2 2/2 PCI: artpec6: Remove local code block from within switch statement

At the moment, the switch statement in the artpec6_pcie_probe() has a local code block where the local variable "val" is defined and immediately used by the artpec6_pcie_readl() within this local scope.

This extra code block adds brackets at the same indentation level as the switch statement itself which can hinder readability of the code.

Thus, move the variable "val" declaration and definition at the top of the function where other variables are already present, and remove the extra code block from within the select statement. This also is the preferred style in the PCI tree.

---
 drivers/pci/controller/dwc/pcie-artpec6.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/controller/dwc/pcie-artpec6.c +2 -4
index 739871bece75..c91fc1954432 100644
@@ -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,7 +444,6 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
 		pci->ep.ops = &pcie_ep_ops;
 
 		return dw_pcie_ep_init(&pci->ep);
-	}
 	default:
 		dev_err(dev, "INVALID device type %d\n", artpec6_pcie->mode);
 	}
Signature · 1 line
2.32.0
maintainer Acked-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] PCI: artpec6: Remove local code block from within switch statement

Quoted 7 lines · Krzysztof Wilczyński

At the moment, the switch statement in the artpec6_pcie_probe() has a local code block where the local variable "val" is defined and immediately used by the artpec6_pcie_readl() within this local scope.

This extra code block adds brackets at the same indentation level as the switch statement itself which can hinder readability of the code.

Quoted 7 lines

Thus, move the variable "val" declaration and definition at the top of the function where other variables are already present, and remove the extra code block from within the select statement. This also is the preferred style in the PCI tree.

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]
maintainer Acked-by on v2 1/2
#3 lore raw
In reply to Krzysztof Wilczyński
Quoted 5 lines · Krzysztof Wilczyński

As part of code refactoring completed in the commit a0fd361db8e5 ("PCI:
dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code") the function artpec6_add_pcie_ep() has been removed and the call to the dw_pcie_ep_init() has been moved into artpec6_pcie_probe().

Quoted 7 lines

This change left a break statement behind that is not needed any more as as the function artpec6_pcie_probe() return immediately after making a call to dw_pcie_ep_init().

Thus remove this surplus break statement that became a dead code.

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]
#4 lore raw
In reply to Krzysztof Wilczyński
Quoted 10 lines · Krzysztof Wilczyński

As part of code refactoring completed in the commit a0fd361db8e5 ("PCI:
dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code") the function artpec6_add_pcie_ep() has been removed and the call to the dw_pcie_ep_init() has been moved into artpec6_pcie_probe().

This change left a break statement behind that is not needed any more as as the function artpec6_pcie_probe() return immediately after making a call to dw_pcie_ep_init().

[...]

Applied to pci/dwc, thanks!

[1/2] PCI: artpec6: Remove surplus break statement after return

      https://git.kernel.org/lpieralisi/pci/c/7c665ce919
[2/2] PCI: artpec6: Remove local code block from within switch statement
      https://git.kernel.org/lpieralisi/pci/c/313b1c763c

Thanks,
Lorenzo