Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b76916462d990751882eaeadc75ac8c487d6de1d

Authored by Adrian Bunk
Committed by Bartlomiej Zolnierkiewicz
1 parent 5e70b7f3c2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ide: remove the ide_etrax100 chipset type 

I forgot to remove the ide_etrax100 chipset type when removing the
ETRAX_IDE driver.

Reported-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 3 changed files with 3 additions and 5 deletions Side-by-side Diff

drivers/ide/ide-probe.c
Diff comments   View file @ b769164
... ... @@ -1333,8 +1333,7 @@
1333 1333 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
1334 1334 const struct ide_port_info *d)
1335 1335 {
1336   - if (d->chipset != ide_etrax100)
1337   - hwif->channel = port;
  1336 + hwif->channel = port;
1338 1337  
1339 1338 if (d->chipset)
1340 1339 hwif->chipset = d->chipset;
... ... @@ -1519,7 +1518,7 @@
1519 1518 continue;
1520 1519 }
1521 1520  
1522   - if (d->chipset != ide_etrax100 && (i & 1) && mate) {
  1521 + if ((i & 1) && mate) {
1523 1522 hwif->mate = mate;
1524 1523 mate->mate = hwif;
1525 1524 }
drivers/ide/ide-proc.c
Diff comments   View file @ b769164
... ... @@ -63,7 +63,6 @@
63 63 case ide_pmac: name = "mac-io"; break;
64 64 case ide_au1xxx: name = "au1xxx"; break;
65 65 case ide_palm3710: name = "palm3710"; break;
66   - case ide_etrax100: name = "etrax100"; break;
67 66 case ide_acorn: name = "acorn"; break;
68 67 default: name = "(unknown)"; break;
69 68 }
... ... @@ -153,7 +153,7 @@
153 153 ide_qd65xx, ide_umc8672, ide_ht6560b,
154 154 ide_rz1000, ide_trm290,
155 155 ide_cmd646, ide_cy82c693, ide_4drives,
156   - ide_pmac, ide_etrax100, ide_acorn,
  156 + ide_pmac, ide_acorn,
157 157 ide_au1xxx, ide_palm3710
158 158 };
159 159