lkml.org 
[lkml]   [2009]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 03/10] ide-floppy: use flags query macros
Date
There should be no functionality change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
---
drivers/ide/ide-floppy.c | 6 +++---
drivers/ide/ide-floppy_ioctl.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index b7f0206..8aa21d1 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -336,7 +336,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive,
else
drive->dev_flags &= ~IDE_DFLAG_WP;

- set_disk_ro(disk, !!(drive->dev_flags & IDE_DFLAG_WP));
+ set_disk_ro(disk, !!ide_drv_write_protected(drive));

page = &pc->buf[8];

@@ -421,7 +421,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
switch (pc.buf[desc_start + 4] & 0x03) {
/* Clik! drive returns this instead of CAPACITY_CURRENT */
case CAPACITY_UNFORMATTED:
- if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE))
+ if (!ide_drv_clik(drive))
/*
* If it is not a clik drive, break out
* (maintains previous driver behaviour)
@@ -471,7 +471,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
}

/* Clik! disk does not support get_flexible_disk_page */
- if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE))
+ if (!ide_drv_clik(drive))
(void) ide_floppy_get_flexible_disk_page(drive, &pc);

return rc;
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 8f8be85..672202d 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -195,7 +195,7 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive,
struct ide_disk_obj *floppy = drive->driver_data;
int progress_indication = 0x10000;

- if (drive->atapi_flags & IDE_AFLAG_SRFP) {
+ if (ide_drv_srfp(drive)) {
ide_create_request_sense_cmd(drive, pc);
if (ide_queue_pc_tail(drive, floppy->disk, pc))
return -EIO;
--
1.6.0.4


\
 
 \ /
  Last update: 2009-02-15 13:11    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site