summaryrefslogtreecommitdiff
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-09-04 03:15:18 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-09-04 03:15:18 -0700
commit99db2bb580fa999dfcefff4ff713f592a3b34153 (patch)
treed91d5445fe5773de3b82e686f87881b926c4447a /include/linux/ide.h
parente42e97d63b46995f3f0d073cae433e4eb87ff5de (diff)
[PATCH] IDE cleanups (2.5; similar to ones done for other drivers)
OK, before the next bunch of gendisk merges, here comes a couple of 2.5 IDE cleanups. a) exclusion between rereading partition tables and open() is done in fs/block_dev.c these days, so homegrown one in ide.c is redundant - that code _never_ blocks now. Removed, just as it had been done with counterparts in other drivers. b) blk_ioctl() calls are done in blkdev_ioctl() now; driver doesn't need to handle them. Again, removed as it had been done in all other drivers.
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index aacdaad8f594..98a2db1db397 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -464,7 +464,6 @@ typedef struct ide_drive_s {
byte nice1; /* flag: give potential excess bandwidth */
unsigned present : 1; /* drive is physically present */
unsigned noprobe : 1; /* from: hdx=noprobe */
- unsigned busy : 1; /* currently doing revalidate_disk() */
unsigned removable : 1; /* 1 if need to do check_media_change */
unsigned forced_geom : 1; /* 1 if hdx=c,h,s was given at boot */
unsigned no_unmask : 1; /* disallow setting unmask bit */
@@ -506,7 +505,6 @@ typedef struct ide_drive_s {
unsigned long long capacity48; /* total number of sectors */
unsigned int drive_data; /* for use by tuneproc/selectproc as needed */
struct hwif_s *hwif; /* actually (ide_hwif_t *) */
- wait_queue_head_t wqueue; /* used to wait for drive in open() */
struct hd_driveid *id; /* drive model identification info */
struct hd_struct *part; /* drive partition table */
char name[4]; /* drive name, such as "hda" */