From: Rafał Miłecki Date: Fri, 1 Apr 2011 10:06:48 +0000 (+0200) Subject: ssb: trivial: use u8 for chip_rev (it's mask is 0xF) X-Git-Tag: v3.0-rc2~7^2~16^2~543 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ce57d9e694d98e421e329fbac5d6f5dc5e9e101e;p=~emulex%2Finfiniband.git ssb: trivial: use u8 for chip_rev (it's mask is 0xF) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville --- diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 29884c00c4d..7dca719fbcf 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c @@ -307,7 +307,7 @@ int ssb_bus_scan(struct ssb_bus *bus, } else { if (bus->bustype == SSB_BUSTYPE_PCI) { bus->chip_id = pcidev_to_chipid(bus->host_pci); - pci_read_config_word(bus->host_pci, PCI_REVISION_ID, + pci_read_config_byte(bus->host_pci, PCI_REVISION_ID, &bus->chip_rev); bus->chip_package = 0; } else { diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index 9659eff52ca..7e99b348834 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h @@ -308,7 +308,7 @@ struct ssb_bus { /* ID information about the Chip. */ u16 chip_id; - u16 chip_rev; + u8 chip_rev; u16 sprom_offset; u16 sprom_size; /* number of words in sprom */ u8 chip_package;