diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-10-17 19:35:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-17 19:35:12 -0700 |
| commit | 2988ef575fb322c58d169bfa510e305fe50f439e (patch) | |
| tree | aa7f528f9808fdc7681ee35cf5a77c6b64653d0b /include/linux | |
| parent | 6b388653a33a519333be2cb42a62bdde6357b88c (diff) | |
[PATCH] cdrom helpers
cdrom_open(), cdrom_release(), cdrom_ioctl() and cdrom_media_changed()
got an additional argument - struct cdrom_device_info *. Drivers that used
to have them as methods are using wrappers that pass right cdrom_device_info.
Existing callers (in ide-cd.c) updated. pcd.c, mcdx.c, sbpcd.c and sr.c
got ->private_data in their disks pointing to relevant objects. Since all
callers of cdrom_find_device() are gone, it got removed. Since all users
of cdrom_device_info->dev are gone, it's not set anymore (and got removed).
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cdrom.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 4387203c95b7..7ac3926382f8 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -731,7 +731,6 @@ struct cdrom_device_info { struct cdrom_device_info *next; /* next device_info for this major */ void *handle; /* driver-dependent data */ /* specifications */ - kdev_t dev; /* device number */ int mask; /* mask of capability: disables them */ int speed; /* maximum speed for reading data */ int capacity; /* number of discs in jukebox */ @@ -776,10 +775,10 @@ struct cdrom_device_ops { }; /* the general block_device operations structure: */ -extern int cdrom_open(struct inode *, struct file *); -extern int cdrom_release(struct inode *, struct file *); -extern int cdrom_ioctl(struct inode *, struct file *, unsigned, unsigned long); -extern int cdrom_media_changed(kdev_t); +extern int cdrom_open(struct cdrom_device_info *, struct inode *, struct file *); +extern int cdrom_release(struct cdrom_device_info *, struct file *); +extern int cdrom_ioctl(struct cdrom_device_info *, struct inode *, unsigned, unsigned long); +extern int cdrom_media_changed(struct cdrom_device_info *); extern int register_cdrom(struct cdrom_device_info *cdi); extern int unregister_cdrom(struct cdrom_device_info *cdi); |