lkml.org 
[lkml]   [2005]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] Remove the ide drive devfs_name field as it's no longer needed
    Date
    From

    Also fixes all drivers that set this field.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/ide/ide-disk.c | 1 -
    drivers/ide/ide-probe.c | 8 --------
    drivers/ide/ide.c | 5 +----
    include/linux/ide.h | 1 -
    4 files changed, 1 insertion(+), 14 deletions(-)

    --- gregkh-2.6.orig/include/linux/ide.h 2005-06-10 23:28:58.000000000 -0700
    +++ gregkh-2.6/include/linux/ide.h 2005-06-10 23:37:24.000000000 -0700
    @@ -668,7 +668,6 @@
    struct hd_driveid *id; /* drive model identification info */
    struct proc_dir_entry *proc; /* /proc/ide/ directory entry */
    struct ide_settings_s *settings;/* /proc/ide/ drive settings */
    - char devfs_name[64]; /* devfs crap */

    struct hwif_s *hwif; /* actually (ide_hwif_t *) */

    --- gregkh-2.6.orig/drivers/ide/ide-disk.c 2005-06-10 23:37:22.000000000 -0700
    +++ gregkh-2.6/drivers/ide/ide-disk.c 2005-06-10 23:37:24.000000000 -0700
    @@ -1048,7 +1048,6 @@
    struct gendisk *g = idkp->disk;

    drive->driver_data = NULL;
    - drive->devfs_name[0] = '\0';
    g->private_data = NULL;
    put_disk(g);
    kfree(idkp);
    --- gregkh-2.6.orig/drivers/ide/ide-probe.c 2005-06-10 23:37:21.000000000 -0700
    +++ gregkh-2.6/drivers/ide/ide-probe.c 2005-06-10 23:37:24.000000000 -0700
    @@ -1307,8 +1307,6 @@
    ide_drive_t *drive = container_of(dev, ide_drive_t, gendev);

    spin_lock_irq(&ide_lock);
    - if (drive->devfs_name[0] != '\0')
    - drive->devfs_name[0] = '\0';
    ide_remove_drive_from_hwgroup(drive);
    if (drive->id != NULL) {
    kfree(drive->id);
    @@ -1344,12 +1342,6 @@
    drive->gendev.bus = &ide_bus_type;
    drive->gendev.driver_data = drive;
    drive->gendev.release = drive_release_dev;
    - if (drive->present) {
    - sprintf(drive->devfs_name, "ide/host%d/bus%d/target%d/lun%d",
    - (hwif->channel && hwif->mate) ?
    - hwif->mate->index : hwif->index,
    - hwif->channel, unit, drive->lun);
    - }
    }
    blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
    THIS_MODULE, ata_probe, ata_lock, hwif);
    --- gregkh-2.6.orig/drivers/ide/ide.c 2005-06-10 23:37:21.000000000 -0700
    +++ gregkh-2.6/drivers/ide/ide.c 2005-06-10 23:37:24.000000000 -0700
    @@ -592,11 +592,8 @@
    goto abort;
    for (unit = 0; unit < MAX_DRIVES; ++unit) {
    drive = &hwif->drives[unit];
    - if (!drive->present) {
    - if (drive->devfs_name[0] != '\0')
    - drive->devfs_name[0] = '\0';
    + if (!drive->present)
    continue;
    - }
    spin_unlock_irq(&ide_lock);
    device_unregister(&drive->gendev);
    down(&drive->gendev_rel_sem);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-06-11 10:37    [W:0.028 / U:178.736 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site