Commit 294c1e4f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Simplify pcie_capability_clear_and_set_word() control flow 

Return early for errors in pcie_capability_clear_and_set_word_unlocked()
and pcie_capability_clear_and_set_dword() to simplify the control flow.

No functional change intended.

Link: https://lore.kernel.org/r/20230824193712.542167-13-helgaas@kernel.org


Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent da545566

drivers/pci/access.c

+10 −12
Original line number Diff line number Diff line
@@ -504,13 +504,12 @@ int pcie_capability_clear_and_set_word_unlocked(struct pci_dev *dev, int pos, 
	u16 val;



	ret = pcie_capability_read_word(dev, pos, &val);

	if (!ret) {

	if (ret)

		return ret;



	val &= ~clear;

	val |= set;

		ret = pcie_capability_write_word(dev, pos, val);

	}



	return ret;

	return pcie_capability_write_word(dev, pos, val);

}

EXPORT_SYMBOL(pcie_capability_clear_and_set_word_unlocked);
@@ -535,13 +534,12 @@ int pcie_capability_clear_and_set_dword(struct pci_dev *dev, int pos, 
	u32 val;



	ret = pcie_capability_read_dword(dev, pos, &val);

	if (!ret) {

	if (ret)

		return ret;



	val &= ~clear;

	val |= set;

		ret = pcie_capability_write_dword(dev, pos, val);

	}



	return ret;

	return pcie_capability_write_dword(dev, pos, val);

}

EXPORT_SYMBOL(pcie_capability_clear_and_set_dword);