From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: gregkh@suse.de
Subject: [PATCH] devfs: Remove the ide drive devfs_name field as it's no longer needed
Date: Mon, 20 Jun 2005 23:30:44 -0700 [thread overview]
Message-ID: <1119335444907@kroah.com> (raw)
In-Reply-To: <11193354443627@kroah.com>
[PATCH] devfs: Remove the ide drive devfs_name field as it's no longer needed
Also fixes all drivers that set this field.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
commit ea01c9408e24fdcd26b87d6f68cafdcdd19a791b
tree 28d6924dd91f30d5068536b8c071e4bccbeb2d20
parent 4a8c1e81ac1235c3861c0ab6c4bad960e945c451
author Greg Kroah-Hartman <gregkh@suse.de> Mon, 20 Jun 2005 21:15:16 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 20 Jun 2005 23:13:38 -0700
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 insertions(+), 14 deletions(-)
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -1048,7 +1048,6 @@ static void ide_disk_release(struct kref
struct gendisk *g = idkp->disk;
drive->driver_data = NULL;
- drive->devfs_name[0] = '\0';
g->private_data = NULL;
put_disk(g);
kfree(idkp);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1307,8 +1307,6 @@ static void drive_release_dev (struct de
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 @@ static void init_gendisk (ide_hwif_t *hw
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);
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -592,11 +592,8 @@ void ide_unregister(unsigned int index)
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);
diff --git a/include/linux/ide.h b/include/linux/ide.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -668,7 +668,6 @@ typedef struct ide_drive_s {
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 *) */
next prev parent reply other threads:[~2005-06-21 7:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <11193354424077@kroah.com>
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs from the init code Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs_mk_symlink() function " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs_mk_dir() " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs_mk_bdev() " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs_mk_cdev() " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove devfs_remove() " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the uart_driver devfs_name field as it's no longer needed Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the gendisk " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the videodevice " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the line_driver " Greg KH
2005-06-21 6:30 ` Greg KH [this message]
2005-06-21 6:30 ` [PATCH] devfs: Remove the scsi_disk " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the tty_driver " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Remove the mode field from usb_class_driver " Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV Greg KH
2005-06-21 6:30 ` [PATCH] devfs: Last little devfs cleanups throughout the kernel tree Greg KH
2005-06-21 8:12 ` Thomas Schneller
2005-06-21 7:09 ` [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed Russell King
2005-06-21 7:18 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1119335444907@kroah.com \
--to=gregkh@suse.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.