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

Download as
Browse Code ยป

Commit 42619d35c7af2f88cad56425fe3981f1f65ff0bd

Authored by Bartlomiej Zolnierkiewicz
1 parent e01286282e
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 IDE_AFLAG_NO_DOORLOCKING 

Just use IDE_DFLAG_DOORLOCKING instead.

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 7 changed files with 7 additions and 8 deletions Side-by-side Diff

drivers/ide/ide-atapi.c
Diff comments   View file @ 42619d3
... ... @@ -191,7 +191,7 @@
191 191 {
192 192 struct ide_atapi_pc pc;
193 193  
194   - if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK)
  194 + if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0)
195 195 return 0;
196 196  
197 197 ide_init_pc(&pc);
drivers/ide/ide-cd.c
Diff comments   View file @ 42619d3
... ... @@ -1732,7 +1732,7 @@
1732 1732 return 0;
1733 1733  
1734 1734 if ((buf[8 + 6] & 0x01) == 0)
1735   - drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
  1735 + drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
1736 1736 if (buf[8 + 6] & 0x08)
1737 1737 drive->atapi_flags &= ~IDE_AFLAG_NO_EJECT;
1738 1738 if (buf[8 + 3] & 0x01)
drivers/ide/ide-cd_ioctl.c
Diff comments   View file @ 42619d3
... ... @@ -136,7 +136,7 @@
136 136 sense = &my_sense;
137 137  
138 138 /* If the drive cannot lock the door, just pretend. */
139   - if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK) {
  139 + if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0) {
140 140 stat = 0;
141 141 } else {
142 142 unsigned char cmd[BLK_MAX_CDB];
... ... @@ -157,7 +157,7 @@
157 157 (sense->asc == 0x24 || sense->asc == 0x20)) {
158 158 printk(KERN_ERR "%s: door locking not supported\n",
159 159 drive->name);
160   - drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
  160 + drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
161 161 stat = 0;
162 162 }
163 163  
drivers/ide/ide-floppy.c
Diff comments   View file @ 42619d3
... ... @@ -592,7 +592,7 @@
592 592 blk_queue_max_sectors(drive->queue, 64);
593 593 drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE;
594 594 /* IOMEGA Clik! drives do not support lock/unlock commands */
595   - drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
  595 + drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
596 596 }
597 597  
598 598 (void) ide_floppy_get_capacity(drive);
drivers/ide/ide-probe.c
Diff comments   View file @ 42619d3
... ... @@ -208,6 +208,7 @@
208 208 drive->ready_stat = 0;
209 209 if (ata_id_cdb_intr(id))
210 210 drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;
  211 + drive->dev_flags |= IDE_DFLAG_DOORLOCKING;
211 212 /* we don't do head unloading on ATAPI devices */
212 213 drive->dev_flags |= IDE_DFLAG_NO_UNLOAD;
213 214 return;
drivers/ide/ide-tape.c
Diff comments   View file @ 42619d3
... ... @@ -2108,7 +2108,7 @@
2108 2108  
2109 2109 /* device lacks locking support according to capabilities page */
2110 2110 if ((caps[6] & 1) == 0)
2111   - drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
  2111 + drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
2112 2112  
2113 2113 if (caps[7] & 0x02)
2114 2114 tape->blk_size = 512;
... ... @@ -464,8 +464,6 @@
464 464 /* ATAPI device flags */
465 465 enum {
466 466 IDE_AFLAG_DRQ_INTERRUPT = (1 << 0),
467   - /* Drive cannot lock the door. */
468   - IDE_AFLAG_NO_DOORLOCK = (1 << 2),
469 467  
470 468 /* ide-cd */
471 469 /* Drive cannot eject the disc. */