Commit 4c407392 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: Clean up accessor macro formatting 

Clean up formatting of PCI accessor macros:

  - Put return statements on own line

  - Add a few empty lines for better readability

  - Align macro continuation backslashes

  - Correct function call argument indentation level

  - Reorder variable declarations to order of use

  - Drop unnecessary variable initialization

Link: https://lore.kernel.org/r/20240429094707.2529-2-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
[bhelgaas: drop initialization, tweak variables to order of use]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c9758cc4

drivers/pci/access.c

+27 −13
Original line number Diff line number Diff line
@@ -36,10 +36,13 @@ DEFINE_RAW_SPINLOCK(pci_lock); 
int noinline pci_bus_read_config_##size \

	(struct pci_bus *bus, unsigned int devfn, int pos, type *value)	\

{									\

	int res;							\

	unsigned long flags;						\

	u32 data = 0;							\

	if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;	\

	int res;							\

									\

	if (PCI_##size##_BAD)						\

		return PCIBIOS_BAD_REGISTER_NUMBER;			\

									\

	pci_lock_config(flags);						\

	res = bus->ops->read(bus, devfn, pos, len, &data);		\

	if (res)							\
@@ -47,6 +50,7 @@ int noinline pci_bus_read_config_##size \ 
	else								\

		*value = (type)data;					\

	pci_unlock_config(flags);					\

									\

	return res;							\

}
@@ -54,12 +58,16 @@ int noinline pci_bus_read_config_##size \ 
int noinline pci_bus_write_config_##size \

	(struct pci_bus *bus, unsigned int devfn, int pos, type value)	\

{									\

	int res;							\

	unsigned long flags;						\

	if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;	\

	int res;							\

									\

	if (PCI_##size##_BAD)						\

		return PCIBIOS_BAD_REGISTER_NUMBER;			\

									\

	pci_lock_config(flags);						\

	res = bus->ops->write(bus, devfn, pos, len, value);		\

	pci_unlock_config(flags);					\

									\

	return res;							\

}
@@ -220,10 +228,12 @@ static noinline void pci_wait_cfg(struct pci_dev *dev) 
int pci_user_read_config_##size						\

	(struct pci_dev *dev, int pos, type *val)			\

{									\

	int ret = PCIBIOS_SUCCESSFUL;					\

	u32 data = -1;							\

	int ret;							\

									\

	if (PCI_##size##_BAD)						\

		return -EINVAL;						\

									\

	raw_spin_lock_irq(&pci_lock);					\

	if (unlikely(dev->block_cfg_access))				\

		pci_wait_cfg(dev);					\
@@ -234,6 +244,7 @@ int pci_user_read_config_##size \ 
		PCI_SET_ERROR_RESPONSE(val);				\

	else								\

		*val = (type)data;					\

									\

	return pcibios_err_to_errno(ret);				\

}									\

EXPORT_SYMBOL_GPL(pci_user_read_config_##size);
@@ -243,15 +254,18 @@ EXPORT_SYMBOL_GPL(pci_user_read_config_##size); 
int pci_user_write_config_##size					\

	(struct pci_dev *dev, int pos, type val)			\

{									\

	int ret = PCIBIOS_SUCCESSFUL;					\

	int ret;							\

									\

	if (PCI_##size##_BAD)						\

		return -EINVAL;						\

									\

	raw_spin_lock_irq(&pci_lock);					\

	if (unlikely(dev->block_cfg_access))				\

		pci_wait_cfg(dev);					\

	ret = dev->bus->ops->write(dev->bus, dev->devfn,		\

				   pos, sizeof(type), val);		\

	raw_spin_unlock_irq(&pci_lock);					\

									\

	return pcibios_err_to_errno(ret);				\

}									\

EXPORT_SYMBOL_GPL(pci_user_write_config_##size);