lkml.org 
[lkml]   [2008]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 07/10] ide: remove needless drive->present checks from device drivers
    Remove needless drive->present checks from ->probe methods
    (device model takes care of that).

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-cd.c | 4 ++--
    drivers/ide/ide-disk.c | 3 +--
    drivers/ide/ide-floppy.c | 4 ++--
    drivers/ide/ide-tape.c | 4 ++--
    drivers/scsi/ide-scsi.c | 1 -
    5 files changed, 7 insertions(+), 9 deletions(-)

    Index: b/drivers/ide/ide-cd.c
    ===================================================================
    --- a/drivers/ide/ide-cd.c
    +++ b/drivers/ide/ide-cd.c
    @@ -2105,10 +2105,10 @@ static int ide_cd_probe(ide_drive_t *dri

    if (!strstr("ide-cdrom", drive->driver_req))
    goto failed;
    - if (!drive->present)
    - goto failed;
    +
    if (drive->media != ide_cdrom && drive->media != ide_optical)
    goto failed;
    +
    /* skip drives that we were told to ignore */
    if (ignore != NULL) {
    if (strstr(ignore, drive->name)) {
    Index: b/drivers/ide/ide-disk.c
    ===================================================================
    --- a/drivers/ide/ide-disk.c
    +++ b/drivers/ide/ide-disk.c
    @@ -1143,8 +1143,7 @@ static int ide_disk_probe(ide_drive_t *d
    /* strstr("foo", "") is non-NULL */
    if (!strstr("ide-disk", drive->driver_req))
    goto failed;
    - if (!drive->present)
    - goto failed;
    +
    if (drive->media != ide_disk)
    goto failed;

    Index: b/drivers/ide/ide-floppy.c
    ===================================================================
    --- a/drivers/ide/ide-floppy.c
    +++ b/drivers/ide/ide-floppy.c
    @@ -1389,10 +1389,10 @@ static int ide_floppy_probe(ide_drive_t

    if (!strstr("ide-floppy", drive->driver_req))
    goto failed;
    - if (!drive->present)
    - goto failed;
    +
    if (drive->media != ide_floppy)
    goto failed;
    +
    if (!idefloppy_identify_device(drive, drive->id)) {
    printk(KERN_ERR "ide-floppy: %s: not supported by this version"
    " of ide-floppy\n", drive->name);
    Index: b/drivers/ide/ide-tape.c
    ===================================================================
    --- a/drivers/ide/ide-tape.c
    +++ b/drivers/ide/ide-tape.c
    @@ -2645,10 +2645,10 @@ static int ide_tape_probe(ide_drive_t *d

    if (!strstr("ide-tape", drive->driver_req))
    goto failed;
    - if (!drive->present)
    - goto failed;
    +
    if (drive->media != ide_tape)
    goto failed;
    +
    if (!idetape_identify_device(drive)) {
    printk(KERN_ERR "ide-tape: %s: not supported by this version of"
    " the driver\n", drive->name);
    Index: b/drivers/scsi/ide-scsi.c
    ===================================================================
    --- a/drivers/scsi/ide-scsi.c
    +++ b/drivers/scsi/ide-scsi.c
    @@ -821,7 +821,6 @@ static int ide_scsi_probe(ide_drive_t *d
    return -ENODEV;

    if (!strstr("ide-scsi", drive->driver_req) ||
    - !drive->present ||
    drive->media == ide_disk ||
    !(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
    return -ENODEV;

    \
     
     \ /
      Last update: 2008-07-26 15:47    [W:0.029 / U:0.820 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site