From 539a101e1b3c9dd05b7a023105823bd2fa186af1 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Wed, 10 Dec 2008 19:07:16 +0000 Subject: [PATCH] This patch changes unsigned [int] to u16 for subsystem IDs. They're in the hardware and have a specific size. Signed-off-by: Myles Watson Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://coreboot.org/repository/coreboot-v3@1069 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- device/pci_device.c | 3 +-- include/device/pci.h | 8 ++++---- northbridge/intel/i945/northbridge.c | 2 +- southbridge/amd/amd8111/ac97.c | 2 +- southbridge/amd/amd8111/acpi.c | 2 +- southbridge/amd/amd8111/ide.c | 2 +- southbridge/amd/amd8111/lpc.c | 2 +- southbridge/amd/amd8111/nic.c | 2 +- southbridge/amd/amd8111/smbus.c | 2 +- southbridge/amd/amd8111/usb.c | 2 +- southbridge/intel/i82801gx/lpc.c | 2 +- southbridge/intel/i82801gx/usb_ehci.c | 3 +-- southbridge/nvidia/mcp55/mcp55.c | 3 +-- southbridge/nvidia/mcp55/mcp55.h | 3 +-- 14 files changed, 17 insertions(+), 21 deletions(-) diff --git a/device/pci_device.c b/device/pci_device.c index 1dbba433e3..a111cf1889 100644 --- a/device/pci_device.c +++ b/device/pci_device.c @@ -710,8 +710,7 @@ void pci_bus_reset(struct bus *bus) delay(1); } -void pci_dev_set_subsystem(struct device *dev, unsigned int vendor, - unsigned int device) +void pci_dev_set_subsystem(struct device *dev, u16 vendor, u16 device) { pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/include/device/pci.h b/include/device/pci.h index ca1b6cd7e4..e1e34a4856 100644 --- a/include/device/pci.h +++ b/include/device/pci.h @@ -44,7 +44,7 @@ /* Common pci operations without a standard interface */ struct pci_operations { /* set the Subsystem IDs for the PCI device */ - void (*set_subsystem)(struct device * dev, unsigned vendor, unsigned device); + void (*set_subsystem)(struct device * dev, u16 vendor, u16 device); }; /* Common pci bus operations */ @@ -60,8 +60,8 @@ struct pci_bus_operations { struct pci_driver { struct device_operations *ops; - unsigned short vendor; - unsigned short device; + u16 vendor; + u16 device; }; #define __pci_driver __attribute__ ((used,__section__(".rodata.pci_driver"))) @@ -94,7 +94,7 @@ u32 pci_moving_config32(struct device *dev, unsigned reg); unsigned pci_find_next_capability(struct device * dev, unsigned cap, unsigned last); unsigned pci_find_capability(struct device * dev, unsigned cap); struct resource *pci_get_resource(struct device *dev, unsigned long index); -void pci_dev_set_subsystem(struct device * dev, unsigned vendor, unsigned device); +void pci_dev_set_subsystem(struct device * dev, u16 vendor, u16 device); void pci_domain_read_resources(struct device *dev); void ram_resource(struct device *dev, unsigned long index, diff --git a/northbridge/intel/i945/northbridge.c b/northbridge/intel/i945/northbridge.c index 2cc38f1b3a..7cc1f21816 100644 --- a/northbridge/intel/i945/northbridge.c +++ b/northbridge/intel/i945/northbridge.c @@ -231,7 +231,7 @@ static void mc_set_resources(struct device * dev) pci_set_resources(dev); } -static void i945_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void i945_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/ac97.c b/southbridge/amd/amd8111/ac97.c index abe9ad14d1..57ba94d2cb 100644 --- a/southbridge/amd/amd8111/ac97.c +++ b/southbridge/amd/amd8111/ac97.c @@ -28,7 +28,7 @@ #include #include "amd8111.h" -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/acpi.c b/southbridge/amd/amd8111/acpi.c index 40462a062a..2f491b1208 100644 --- a/southbridge/amd/amd8111/acpi.c +++ b/southbridge/amd/amd8111/acpi.c @@ -208,7 +208,7 @@ static void acpi_enable_resources(struct device * dev) } -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, 0x7c, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/ide.c b/southbridge/amd/amd8111/ide.c index 6f4a16d58f..e845599e18 100644 --- a/southbridge/amd/amd8111/ide.c +++ b/southbridge/amd/amd8111/ide.c @@ -63,7 +63,7 @@ static void ide_init(struct device *dev) pci_write_config16(dev, 0x42, word); } -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, 0x70, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/lpc.c b/southbridge/amd/amd8111/lpc.c index 299f8e6af9..55e46640ae 100644 --- a/southbridge/amd/amd8111/lpc.c +++ b/southbridge/amd/amd8111/lpc.c @@ -197,7 +197,7 @@ static void amd8111_lpc_enable_resources(struct device * dev) enable_childrens_resources(dev); } -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, 0x70, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/nic.c b/southbridge/amd/amd8111/nic.c index 1101a6cc29..752ad2e1be 100644 --- a/southbridge/amd/amd8111/nic.c +++ b/southbridge/amd/amd8111/nic.c @@ -83,7 +83,7 @@ static void nic_init(struct device *dev) printk(BIOS_DEBUG, "Done\n"); } -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, 0xc8, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/smbus.c b/southbridge/amd/amd8111/smbus.c index 7a589f21f7..8fefb3d0dd 100644 --- a/southbridge/amd/amd8111/smbus.c +++ b/southbridge/amd/amd8111/smbus.c @@ -34,7 +34,7 @@ #include #include "amd8111.h" -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, 0x44, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/amd/amd8111/usb.c b/southbridge/amd/amd8111/usb.c index 271377dfcb..1a1b8c3789 100644 --- a/southbridge/amd/amd8111/usb.c +++ b/southbridge/amd/amd8111/usb.c @@ -34,7 +34,7 @@ #include "amd8111.h" -static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void lpci_set_subsystem(struct device * dev, u16 vendor, u16 device) { pci_write_config32(dev, 0x70, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/intel/i82801gx/lpc.c b/southbridge/intel/i82801gx/lpc.c index a80bf6b252..123aba8166 100644 --- a/southbridge/intel/i82801gx/lpc.c +++ b/southbridge/intel/i82801gx/lpc.c @@ -325,7 +325,7 @@ static void i82801gx_lpc_enable_resources(struct device * dev) enable_childrens_resources(dev); } -static void set_subsystem(struct device * dev, unsigned vendor, unsigned device) +static void set_subsystem(struct device * dev, u16 vendor, u16 device) { printk(BIOS_DEBUG, "Setting LPC bridge subsystem ID\n"); pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, diff --git a/southbridge/intel/i82801gx/usb_ehci.c b/southbridge/intel/i82801gx/usb_ehci.c index 0fb30856bf..b1cdad0e47 100644 --- a/southbridge/intel/i82801gx/usb_ehci.c +++ b/southbridge/intel/i82801gx/usb_ehci.c @@ -49,8 +49,7 @@ static void usb_ehci_init(struct device *dev) printk(BIOS_DEBUG, "done.\n"); } -static void usb_ehci_set_subsystem(struct device * dev, unsigned vendor, - unsigned device) +static void usb_ehci_set_subsystem(struct device * dev, u16 vendor, u16 device) { u8 access_cntl; diff --git a/southbridge/nvidia/mcp55/mcp55.c b/southbridge/nvidia/mcp55/mcp55.c index e57aa24b65..77ecc8159e 100644 --- a/southbridge/nvidia/mcp55/mcp55.c +++ b/southbridge/nvidia/mcp55/mcp55.c @@ -248,8 +248,7 @@ static void mcp55_enable(struct device *dev) } -void mcp55_pci_dev_set_subsystem(struct device *dev, unsigned int vendor, - unsigned int device) +void mcp55_pci_dev_set_subsystem(struct device *dev, u16 vendor, u16 device) { pci_write_config32(dev, PCI_MCP55_SUBSYSTEM_VENDOR_ID, ((device & 0xffff) << 16) | (vendor & 0xffff)); diff --git a/southbridge/nvidia/mcp55/mcp55.h b/southbridge/nvidia/mcp55/mcp55.h index de0ff80ce6..bbfa1c1ba6 100644 --- a/southbridge/nvidia/mcp55/mcp55.h +++ b/southbridge/nvidia/mcp55/mcp55.h @@ -24,8 +24,7 @@ #define PCI_MCP55_SUBSYSTEM_VENDOR_ID 0x40 -void mcp55_pci_dev_set_subsystem(struct device *dev, unsigned int vendor, - unsigned int device); +void mcp55_pci_dev_set_subsystem(struct device *dev, u16 vendor, u16 device); extern struct pci_operations mcp55_pci_dev_ops_pci; #endif /* MCP55_H */