Commit fd1ae23b authored by Krzysztof Wilczyński's avatar Krzysztof Wilczyński Committed by Bjorn Helgaas
Browse files

PCI: Prefer 'unsigned int' over bare 'unsigned' 

The bare "unsigned" type implicitly means "unsigned int", but the preferred
coding style is to use the complete type name.

Update the bare use of "unsigned" to the preferred "unsigned int".

No change to functionality intended.

See a1ce18e4 ("checkpatch: warn on bare unsigned or signed declarations
without int").

Link: https://lore.kernel.org/r/20211013014136.1117543-1-kw@linux.com


Signed-off-by: default avatarKrzysztof Wilczyński <kw@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent ff5d3bb6

drivers/pci/controller/pci-thunder-ecam.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static void set_val(u32 v, int where, int size, u32 *val) 
{

	int shift = (where & 3) * 8;



	pr_debug("set_val %04x: %08x\n", (unsigned)(where & ~3), v);

	pr_debug("set_val %04x: %08x\n", (unsigned int)(where & ~3), v);

	v >>= shift;

	if (size == 1)

		v &= 0xff;
@@ -187,7 +187,7 @@ static int thunder_ecam_config_read(struct pci_bus *bus, unsigned int devfn, 


	pr_debug("%04x:%04x - Fix pass#: %08x, where: %03x, devfn: %03x\n",

		 vendor_device & 0xffff, vendor_device >> 16, class_rev,

		 (unsigned) where, devfn);

		 (unsigned int)where, devfn);



	/* Check for non type-00 header */

	if (cfg_type == 0) {

drivers/pci/msi.c

+2 −1
Original line number Diff line number Diff line
@@ -579,7 +579,8 @@ static int msi_capability_init(struct pci_dev *dev, int nvec, 
	return ret;

}



static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries)

static void __iomem *msix_map_region(struct pci_dev *dev,

				     unsigned int nr_entries)

{

	resource_size_t phys_addr;

	u32 table_offset;

drivers/pci/pci.c

+3 −2
Original line number Diff line number Diff line
@@ -6324,11 +6324,12 @@ EXPORT_SYMBOL_GPL(pci_pr3_present); 
 * cannot be left as a userspace activity).  DMA aliases should therefore

 * be configured via quirks, such as the PCI fixup header quirk.

 */

void pci_add_dma_alias(struct pci_dev *dev, u8 devfn_from, unsigned nr_devfns)

void pci_add_dma_alias(struct pci_dev *dev, u8 devfn_from,

		       unsigned int nr_devfns)

{

	int devfn_to;



	nr_devfns = min(nr_devfns, (unsigned) MAX_NR_DEVFNS - devfn_from);

	nr_devfns = min(nr_devfns, (unsigned int)MAX_NR_DEVFNS - devfn_from);

	devfn_to = devfn_from + nr_devfns - 1;



	if (!dev->dma_alias_mask)

drivers/pci/probe.c

+4 −3
Original line number Diff line number Diff line
@@ -2550,11 +2550,12 @@ struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) 
}

EXPORT_SYMBOL(pci_scan_single_device);



static unsigned next_fn(struct pci_bus *bus, struct pci_dev *dev, unsigned fn)

static unsigned int next_fn(struct pci_bus *bus, struct pci_dev *dev,

			    unsigned int fn)

{

	int pos;

	u16 cap = 0;

	unsigned next_fn;

	unsigned int next_fn;



	if (pci_ari_enabled(bus)) {

		if (!dev)
@@ -2613,7 +2614,7 @@ static int only_one_child(struct pci_bus *bus) 
 */

int pci_scan_slot(struct pci_bus *bus, int devfn)

{

	unsigned fn, nr = 0;

	unsigned int fn, nr = 0;

	struct pci_dev *dev;



	if (only_one_child(bus) && (devfn > 0))

drivers/pci/quirks.c

+6 −6
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static void quirk_s3_64M(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_868,		quirk_s3_64M);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_968,		quirk_s3_64M);



static void quirk_io(struct pci_dev *dev, int pos, unsigned size,

static void quirk_io(struct pci_dev *dev, int pos, unsigned int size,

		     const char *name)

{

	u32 region;
@@ -552,7 +552,7 @@ static void quirk_cs5536_vsa(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);



static void quirk_io_region(struct pci_dev *dev, int port,

				unsigned size, int nr, const char *name)

			    unsigned int size, int nr, const char *name)

{

	u16 region;

	struct pci_bus_region bus_region;
@@ -666,7 +666,7 @@ static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int p 
	base = devres & 0xffff;

	size = 16;

	for (;;) {

		unsigned bit = size >> 1;

		unsigned int bit = size >> 1;

		if ((bit & mask) == bit)

			break;

		size = bit;
@@ -692,7 +692,7 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int 
	mask = (devres & 0x3f) << 16;

	size = 128 << 16;

	for (;;) {

		unsigned bit = size >> 1;

		unsigned int bit = size >> 1;

		if ((bit & mask) == bit)

			break;

		size = bit;
@@ -806,7 +806,7 @@ static void ich6_lpc_acpi_gpio(struct pci_dev *dev) 
				"ICH6 GPIO");

}



static void ich6_lpc_generic_decode(struct pci_dev *dev, unsigned reg,

static void ich6_lpc_generic_decode(struct pci_dev *dev, unsigned int reg,

				    const char *name, int dynsize)

{

	u32 val;
@@ -850,7 +850,7 @@ static void quirk_ich6_lpc(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ICH6_0, quirk_ich6_lpc);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ICH6_1, quirk_ich6_lpc);



static void ich7_lpc_generic_decode(struct pci_dev *dev, unsigned reg,

static void ich7_lpc_generic_decode(struct pci_dev *dev, unsigned int reg,

				    const char *name)

{

	u32 val;