diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2011-04-01 06:06:48 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:06 -0400 |
commit | ce57d9e694d98e421e329fbac5d6f5dc5e9e101e (patch) | |
tree | f22695ac2aa83c5d90d583f222e219ddf1d0f912 | |
parent | 832fd35a545ecde11082d2dab74dd0aef8e0505e (diff) |
ssb: trivial: use u8 for chip_rev (it's mask is 0xF)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/ssb/scan.c | 2 | ||||
-rw-r--r-- | include/linux/ssb/ssb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 29884c00c4d5..7dca719fbcfb 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c | |||
@@ -307,7 +307,7 @@ int ssb_bus_scan(struct ssb_bus *bus, | |||
307 | } else { | 307 | } else { |
308 | if (bus->bustype == SSB_BUSTYPE_PCI) { | 308 | if (bus->bustype == SSB_BUSTYPE_PCI) { |
309 | bus->chip_id = pcidev_to_chipid(bus->host_pci); | 309 | bus->chip_id = pcidev_to_chipid(bus->host_pci); |
310 | pci_read_config_word(bus->host_pci, PCI_REVISION_ID, | 310 | pci_read_config_byte(bus->host_pci, PCI_REVISION_ID, |
311 | &bus->chip_rev); | 311 | &bus->chip_rev); |
312 | bus->chip_package = 0; | 312 | bus->chip_package = 0; |
313 | } else { | 313 | } else { |
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index 9659eff52ca2..7e99b348834c 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h | |||
@@ -308,7 +308,7 @@ struct ssb_bus { | |||
308 | 308 | ||
309 | /* ID information about the Chip. */ | 309 | /* ID information about the Chip. */ |
310 | u16 chip_id; | 310 | u16 chip_id; |
311 | u16 chip_rev; | 311 | u8 chip_rev; |
312 | u16 sprom_offset; | 312 | u16 sprom_offset; |
313 | u16 sprom_size; /* number of words in sprom */ | 313 | u16 sprom_size; /* number of words in sprom */ |
314 | u8 chip_package; | 314 | u8 chip_package; |