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

Download as
Browse Code ยป

Commit da167876bd0f71f1c646e5dd98997544d8d90e8e

Authored by Bartlomiej Zolnierkiewicz
1 parent fe11edfaab
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: IDE_AFLAG_WP -> IDE_DFLAG_WP 

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 2 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/ide/ide-floppy.c
Diff comments   View file @ da16787
... ... @@ -410,11 +410,11 @@
410 410 }
411 411  
412 412 if (pc.buf[3] & 0x80)
413   - drive->atapi_flags |= IDE_AFLAG_WP;
  413 + drive->dev_flags |= IDE_DFLAG_WP;
414 414 else
415   - drive->atapi_flags &= ~IDE_AFLAG_WP;
  415 + drive->dev_flags &= ~IDE_DFLAG_WP;
416 416  
417   - set_disk_ro(disk, !!(drive->atapi_flags & IDE_AFLAG_WP));
  417 + set_disk_ro(disk, !!(drive->dev_flags & IDE_DFLAG_WP));
418 418  
419 419 page = &pc.buf[8];
420 420  
... ... @@ -684,7 +684,7 @@
684 684 goto out_put_floppy;
685 685 }
686 686  
687   - if ((drive->atapi_flags & IDE_AFLAG_WP) && (filp->f_mode & 2)) {
  687 + if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) {
688 688 ret = -EROFS;
689 689 goto out_put_floppy;
690 690 }
... ... @@ -503,8 +503,6 @@
503 503 IDE_AFLAG_CLIK_DRIVE = (1 << 19),
504 504 /* Requires BH algorithm for packets */
505 505 IDE_AFLAG_ZIP_DRIVE = (1 << 20),
506   - /* Write protect */
507   - IDE_AFLAG_WP = (1 << 21),
508 506 /* Supports format progress report */
509 507 IDE_AFLAG_SRFP = (1 << 22),
510 508  
... ... @@ -579,6 +577,8 @@
579 577 /* heads unloaded, please don't reset port */
580 578 IDE_DFLAG_PARKED = (1 << 28),
581 579 IDE_DFLAG_MEDIA_CHANGED = (1 << 29),
  580 + /* write protect */
  581 + IDE_DFLAG_WP = (1 << 30),
582 582 };
583 583  
584 584 struct ide_drive_s {