Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata_piix: minor typo and a printk fix

The patch fixes a printk() being cut in half, some typos
and a change in comments to better reflect the specs.

Signed-off-by: Levente Kurusa <levex@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

authored by

Levente Kurusa and committed by
Tejun Heo
89951f22 ed08d40c

+10 -9
+10 -9
drivers/ata/ata_piix.c
··· 100 100 101 101 enum { 102 102 PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ 103 - ICH5_PMR = 0x90, /* port mapping register */ 103 + ICH5_PMR = 0x90, /* address map register */ 104 104 ICH5_PCS = 0x92, /* port control and status */ 105 105 PIIX_SIDPR_BAR = 5, 106 106 PIIX_SIDPR_LEN = 16, ··· 233 233 PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata }, 234 234 /* 82801GB/GR/GH (ICH7, identical to ICH6) */ 235 235 { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, 236 - /* 2801GBM/GHM (ICH7M, identical to ICH6M) */ 236 + /* 82801GBM/GHM (ICH7M, identical to ICH6M) */ 237 237 { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata }, 238 238 /* Enterprise Southbridge 2 (631xESB/632xESB) */ 239 239 { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, ··· 517 517 const struct ich_laptop *lap = &ich_laptop[0]; 518 518 u8 mask; 519 519 520 - /* Check for specials - Acer Aspire 5602WLMi */ 520 + /* Check for specials */ 521 521 while (lap->device) { 522 522 if (lap->device == pdev->device && 523 523 lap->subvendor == pdev->subsystem_vendor && ··· 1366 1366 const int *map; 1367 1367 int i, invalid_map = 0; 1368 1368 u8 map_value; 1369 + char buf[32]; 1370 + char *p = buf, *end = buf + sizeof(buf); 1369 1371 1370 1372 pci_read_config_byte(pdev, ICH5_PMR, &map_value); 1371 1373 1372 1374 map = map_db->map[map_value & map_db->mask]; 1373 1375 1374 - dev_info(&pdev->dev, "MAP ["); 1375 1376 for (i = 0; i < 4; i++) { 1376 1377 switch (map[i]) { 1377 1378 case RV: 1378 1379 invalid_map = 1; 1379 - pr_cont(" XX"); 1380 + p += scnprintf(p, end - p, " XX"); 1380 1381 break; 1381 1382 1382 1383 case NA: 1383 - pr_cont(" --"); 1384 + p += scnprintf(p, end - p, " --"); 1384 1385 break; 1385 1386 1386 1387 case IDE: 1387 1388 WARN_ON((i & 1) || map[i + 1] != IDE); 1388 1389 pinfo[i / 2] = piix_port_info[ich_pata_100]; 1389 1390 i++; 1390 - pr_cont(" IDE IDE"); 1391 + p += scnprintf(p, end - p, " IDE IDE"); 1391 1392 break; 1392 1393 1393 1394 default: 1394 - pr_cont(" P%d", map[i]); 1395 + p += scnprintf(p, end - p, " P%d", map[i]); 1395 1396 if (i & 1) 1396 1397 pinfo[i / 2].flags |= ATA_FLAG_SLAVE_POSS; 1397 1398 break; 1398 1399 } 1399 1400 } 1400 - pr_cont(" ]\n"); 1401 + dev_info(&pdev->dev, "MAP [%s ]\n", buf); 1401 1402 1402 1403 if (invalid_map) 1403 1404 dev_err(&pdev->dev, "invalid MAP value %u\n", map_value);