From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] Remove the ide drive devfs_name field as it's no longer needed
Date: Sat, 11 Jun 2005 00:48:32 -0700 [thread overview]
Message-ID: <11184761123101@kroah.com> (raw)
In-Reply-To: <11184761121906@kroah.com>
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);
next prev parent reply other threads:[~2005-06-11 8:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <11184761102127@kroah.com>
2005-06-11 7:48 ` [PATCH] Remove devfs from the partition code Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs from the init code Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs_*_tape() functions from the kernel tree Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs_mk_dir() function " Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs_mk_symlink() " Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs_mk_bdev() " Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs_mk_cdev() " Greg KH
2005-06-11 7:48 ` [PATCH] Remove devfs_remove() " Greg KH
2005-06-11 7:48 ` [PATCH] Remove the devfs_fs_kernel.h file from the tree Greg KH
2005-06-11 7:48 ` [PATCH] Remove the miscdevice devfs_name field as it's no longer needed Greg KH
2005-06-11 7:48 ` [PATCH] Remove the gendisk " Greg KH
2005-06-11 7:48 ` [PATCH] Remove the uart_driver " Greg KH
2005-06-11 7:48 ` [PATCH] Remove the videodevice " Greg KH
2005-06-11 7:48 ` Greg KH [this message]
2005-06-11 7:48 ` [PATCH] Remove the line_driver " Greg KH
2005-06-11 7:48 ` [PATCH] Remove the scsi_disk " Greg KH
2005-06-11 7:48 ` [PATCH] Remove the tty_driver " Greg KH
2005-06-11 7:48 ` [PATCH] Remove the mode field from usb_class_driver " Greg KH
2005-06-11 7:48 ` [PATCH] Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV Greg KH
2005-06-11 7:48 ` [PATCH] Last little devfs cleanups throughout the kernel tree Greg KH
2005-06-11 19:05 ` [PATCH] Remove devfs_mk_cdev() function from " Adrian Bunk
2005-06-13 18:15 ` Greg KH
2005-06-12 8:44 ` Armin Schindler
2005-06-12 13:29 ` Ed Tomlinson
2005-06-12 13:51 ` Armin Schindler
2005-06-12 15:12 ` Adrian Bunk
2005-06-12 15:36 ` Ed Tomlinson
2005-06-12 18:32 ` Armin Schindler
2005-06-13 18:13 ` Greg KH
2005-06-14 6:54 ` Armin Schindler
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=11184761123101@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox