aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/ymfpci.h2
-rw-r--r--sound/pci/ca0106/ca0106.h2
-rw-r--r--sound/pci/ca0106/ca0106_main.c2
-rw-r--r--sound/pci/emu10k1/emu10k1x.c4
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index a3c5de59a248..f3514ee96bd9 100644
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -286,7 +286,7 @@ struct snd_ymfpci {
286 int irq; 286 int irq;
287 287
288 unsigned int device_id; /* PCI device ID */ 288 unsigned int device_id; /* PCI device ID */
289 unsigned int rev; /* PCI revision */ 289 unsigned char rev; /* PCI revision */
290 unsigned long reg_area_phys; 290 unsigned long reg_area_phys;
291 void __iomem *reg_area_virt; 291 void __iomem *reg_area_virt;
292 struct resource *res_reg_area; 292 struct resource *res_reg_area;
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index 9cb66c59f523..aaac6e5b4767 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -590,7 +590,7 @@ struct snd_ca0106 {
590 struct resource *res_port; 590 struct resource *res_port;
591 int irq; 591 int irq;
592 592
593 unsigned int revision; /* chip revision */ 593 unsigned char revision; /* chip revision */
594 unsigned int serial; /* serial number */ 594 unsigned int serial; /* serial number */
595 unsigned short model; /* subsystem id */ 595 unsigned short model; /* subsystem id */
596 596
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 6fa4a302f7de..2adbd003851d 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1283,7 +1283,7 @@ static int __devinit snd_ca0106_create(struct snd_card *card,
1283 1283
1284 pci_set_master(pci); 1284 pci_set_master(pci);
1285 /* read revision & serial */ 1285 /* read revision & serial */
1286 pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision); 1286 pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
1287 pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); 1287 pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
1288 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); 1288 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
1289#if 1 1289#if 1
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index c46905a11175..e0724394ed25 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -235,7 +235,7 @@ struct emu10k1x {
235 struct resource *res_port; 235 struct resource *res_port;
236 int irq; 236 int irq;
237 237
238 unsigned int revision; /* chip revision */ 238 unsigned char revision; /* chip revision */
239 unsigned int serial; /* serial number */ 239 unsigned int serial; /* serial number */
240 unsigned short model; /* subsystem id */ 240 unsigned short model; /* subsystem id */
241 241
@@ -943,7 +943,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
943 943
944 pci_set_master(pci); 944 pci_set_master(pci);
945 /* read revision & serial */ 945 /* read revision & serial */
946 pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision); 946 pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
947 pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial); 947 pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
948 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model); 948 pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
949 snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model, 949 snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 16be1f395484..843dcca1d4a5 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2291,7 +2291,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
2291 chip->pci = pci; 2291 chip->pci = pci;
2292 chip->irq = -1; 2292 chip->irq = -1;
2293 chip->device_id = pci->device; 2293 chip->device_id = pci->device;
2294 pci_read_config_byte(pci, PCI_REVISION_ID, (u8 *)&chip->rev); 2294 pci_read_config_byte(pci, PCI_REVISION_ID, &chip->rev);
2295 chip->reg_area_phys = pci_resource_start(pci, 0); 2295 chip->reg_area_phys = pci_resource_start(pci, 0);
2296 chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000); 2296 chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000);
2297 pci_set_master(pci); 2297 pci_set_master(pci);