lkml.org 
[lkml]   [2008]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 06/18] ide-{disk,floppy}: set IDE_DFLAG_ATTACH in *_setup()
    There should be no functional changes caused by this patch.

    Cc: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/ide-disk.c | 18 ++++++++++--------
    drivers/ide/ide-floppy.c | 3 ++-
    2 files changed, 12 insertions(+), 9 deletions(-)

    Index: b/drivers/ide/ide-disk.c
    ===================================================================
    --- a/drivers/ide/ide-disk.c
    +++ b/drivers/ide/ide-disk.c
    @@ -710,6 +710,14 @@ static void idedisk_setup(ide_drive_t *d
    drive->dev_flags |= IDE_DFLAG_WCACHE;

    set_wcache(drive, 1);
    +
    + if ((drive->dev_flags & IDE_DFLAG_LBA) == 0 &&
    + (drive->head == 0 || drive->head > 16)) {
    + printk(KERN_ERR "%s: invalid geometry: %d physical heads?\n",
    + drive->name, drive->head);
    + drive->dev_flags &= ~IDE_DFLAG_ATTACH;
    + } else
    + drive->dev_flags |= IDE_DFLAG_ATTACH;
    }

    static void ide_cacheflush_p(ide_drive_t *drive)
    @@ -952,19 +960,13 @@ static int ide_disk_probe(ide_drive_t *d
    drive->driver_data = idkp;

    idedisk_setup(drive);
    - if ((drive->dev_flags & IDE_DFLAG_LBA) == 0 &&
    - (drive->head == 0 || drive->head > 16)) {
    - printk(KERN_ERR "%s: INVALID GEOMETRY: %d PHYSICAL HEADS?\n",
    - drive->name, drive->head);
    - drive->dev_flags &= ~IDE_DFLAG_ATTACH;
    - } else
    - drive->dev_flags |= IDE_DFLAG_ATTACH;
    +
    + set_capacity(g, ide_disk_capacity(drive));

    g->minors = 1 << PARTN_BITS;
    g->driverfs_dev = &drive->gendev;
    if (drive->dev_flags & IDE_DFLAG_REMOVABLE)
    g->flags = GENHD_FL_REMOVABLE;
    - set_capacity(g, ide_disk_capacity(drive));
    g->fops = &idedisk_ops;
    add_disk(g);
    return 0;
    Index: b/drivers/ide/ide-floppy.c
    ===================================================================
    --- a/drivers/ide/ide-floppy.c
    +++ b/drivers/ide/ide-floppy.c
    @@ -598,6 +598,8 @@ static void idefloppy_setup(ide_drive_t
    (void) ide_floppy_get_capacity(drive);

    ide_proc_register_driver(drive, floppy->driver);
    +
    + drive->dev_flags |= IDE_DFLAG_ATTACH;
    }

    static void ide_floppy_remove(ide_drive_t *drive)
    @@ -807,7 +809,6 @@ static int ide_floppy_probe(ide_drive_t
    drive->debug_mask = debug_mask;

    idefloppy_setup(drive, floppy);
    - drive->dev_flags |= IDE_DFLAG_ATTACH;

    g->minors = 1 << PARTN_BITS;
    g->driverfs_dev = &drive->gendev;

    \
     
     \ /
      Last update: 2008-09-08 00:21    [W:0.027 / U:0.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site