redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ata_piix: minor typo and a printk fix

Browse source 
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>
This commit is contained in:
Levente Kurusa 2013-10-01 19:56:48 +02:00 committed by Tejun Heo
parent ed08d40cde
commit 89951f2245
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/ata/ata_piix.c
View file

@ -100,7 +100,7 @@
enum { enum {
PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ PIIX_IOCFG = 0x54, /* IDE I/O configuration register */
ICH5_PMR = 0x90, /* port mapping register */ ICH5_PMR = 0x90, /* address map register */
ICH5_PCS = 0x92, /* port control and status */ ICH5_PCS = 0x92, /* port control and status */
PIIX_SIDPR_BAR = 5, PIIX_SIDPR_BAR = 5,
PIIX_SIDPR_LEN = 16, PIIX_SIDPR_LEN = 16,
@ -233,7 +233,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata }, PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata },
/* 82801GB/GR/GH (ICH7, identical to ICH6) */ /* 82801GB/GR/GH (ICH7, identical to ICH6) */
{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
/* 2801GBM/GHM (ICH7M, identical to ICH6M) */ /* 82801GBM/GHM (ICH7M, identical to ICH6M) */
{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata }, { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata },
/* Enterprise Southbridge 2 (631xESB/632xESB) */ /* Enterprise Southbridge 2 (631xESB/632xESB) */
{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
@ -517,7 +517,7 @@ static int ich_pata_cable_detect(struct ata_port *ap)
const struct ich_laptop *lap = &ich_laptop[0]; const struct ich_laptop *lap = &ich_laptop[0];
u8 mask; u8 mask;
/* Check for specials - Acer Aspire 5602WLMi */ /* Check for specials */
while (lap->device) { while (lap->device) {
if (lap->device == pdev->device && if (lap->device == pdev->device &&
lap->subvendor == pdev->subsystem_vendor && lap->subvendor == pdev->subsystem_vendor &&
@ -1366,38 +1366,39 @@ static const int *piix_init_sata_map(struct pci_dev *pdev,
const int *map; const int *map;
int i, invalid_map = 0; int i, invalid_map = 0;
u8 map_value; u8 map_value;
char buf[32];
char *p = buf, *end = buf + sizeof(buf);
pci_read_config_byte(pdev, ICH5_PMR, &map_value); pci_read_config_byte(pdev, ICH5_PMR, &map_value);
map = map_db->map[map_value & map_db->mask]; map = map_db->map[map_value & map_db->mask];
dev_info(&pdev->dev, "MAP [");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
switch (map[i]) { switch (map[i]) {
case RV: case RV:
invalid_map = 1; invalid_map = 1;
pr_cont(" XX"); p += scnprintf(p, end - p, " XX");
break; break;
case NA: case NA:
pr_cont(" --"); p += scnprintf(p, end - p, " --");
break; break;
case IDE: case IDE:
WARN_ON((i & 1) || map[i + 1] != IDE); WARN_ON((i & 1) || map[i + 1] != IDE);
pinfo[i / 2] = piix_port_info[ich_pata_100]; pinfo[i / 2] = piix_port_info[ich_pata_100];
i++; i++;
pr_cont(" IDE IDE"); p += scnprintf(p, end - p, " IDE IDE");
break; break;
default: default:
pr_cont(" P%d", map[i]); p += scnprintf(p, end - p, " P%d", map[i]);
if (i & 1) if (i & 1)
pinfo[i / 2].flags |= ATA_FLAG_SLAVE_POSS; pinfo[i / 2].flags |= ATA_FLAG_SLAVE_POSS;
break; break;
} }
} }
pr_cont(" ]\n"); dev_info(&pdev->dev, "MAP [%s ]\n", buf);
if (invalid_map) if (invalid_map)
dev_err(&pdev->dev, "invalid MAP value %u\n", map_value); dev_err(&pdev->dev, "invalid MAP value %u\n", map_value);