[PATCH] cdrom.c cleanups

	* Bunch of functions in cdrom.c used to get kdev_t and use it
only to do cdrom_find_device(dev), even though their callers already
had struct cdrom_device_info * in question.  Switched to passing
said pointer directly.
	* useless exports removed; stuff not used outside of cdrom.c
made static.

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index fc2fa884e1ed08d5fb1c013c00aa921522d64658..2c13712d90c5fe4ee5b72639fe95791df7ce90f7 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -318,8 +318,9 @@ static void sanitize_format(union cdrom_addr *addr,
 static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
                     unsigned long arg);
 
-int cdrom_get_last_written(kdev_t dev, long *last_written);
-int cdrom_get_next_writable(kdev_t dev, long *next_writable);
+int cdrom_get_last_written(struct cdrom_device_info *, long *);
+static int cdrom_get_next_writable(struct cdrom_device_info *, long *);
+static void cdrom_count_tracks(struct cdrom_device_info *, tracktype*);
 
 #ifdef CONFIG_SYSCTL
 static void cdrom_sysctl_register(void);
@@ -436,7 +437,7 @@ int unregister_cdrom(struct cdrom_device_info *unreg)
        return 0;
 }
 
-struct cdrom_device_info *cdrom_find_device(kdev_t dev)
+static struct cdrom_device_info *cdrom_find_device(kdev_t dev)
 {
        struct cdrom_device_info *cdi;
 
@@ -775,7 +776,7 @@ static int cdrom_load_unload(struct cdrom_device_info *cdi, int slot)
        return cdi->ops->generic_packet(cdi, &cgc);
 }
 
-int cdrom_select_disc(struct cdrom_device_info *cdi, int slot)
+static int cdrom_select_disc(struct cdrom_device_info *cdi, int slot)
 {
        struct cdrom_changer_info info;
        int curslot;
@@ -859,7 +860,7 @@ int cdrom_media_changed(kdev_t dev)
 }
 
 /* badly broken, I know. Is due for a fixup anytime. */
-void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype* tracks)
+static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype* tracks)
 {
        struct cdrom_tochdr header;
        struct cdrom_tocentry entry;
@@ -1921,7 +1922,6 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
 {              
        struct cdrom_device_ops *cdo = cdi->ops;
        struct cdrom_generic_command cgc;
-       kdev_t dev = cdi->dev;
        char buffer[32];
        int ret = 0;
 
@@ -2193,7 +2193,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
        case CDROM_NEXT_WRITABLE: {
                long next = 0;
                cdinfo(CD_DO_IOCTL, "entering CDROM_NEXT_WRITABLE\n"); 
-               if ((ret = cdrom_get_next_writable(dev, &next)))
+               if ((ret = cdrom_get_next_writable(cdi, &next)))
                        return ret;
                IOCTL_OUT(arg, long, next);
                return 0;
@@ -2201,7 +2201,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
        case CDROM_LAST_WRITTEN: {
                long last = 0;
                cdinfo(CD_DO_IOCTL, "entering CDROM_LAST_WRITTEN\n"); 
-               if ((ret = cdrom_get_last_written(dev, &last)))
+               if ((ret = cdrom_get_last_written(cdi, &last)))
                        return ret;
                IOCTL_OUT(arg, long, last);
                return 0;
@@ -2211,10 +2211,9 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
        return -ENOTTY;
 }
 
-int cdrom_get_track_info(kdev_t dev, __u16 track, __u8 type,
+static int cdrom_get_track_info(struct cdrom_device_info *cdi, __u16 track, __u8 type,
                         track_information *ti)
 {
-        struct cdrom_device_info *cdi = cdrom_find_device(dev);
        struct cdrom_device_ops *cdo = cdi->ops;
        struct cdrom_generic_command cgc;
        int ret;
@@ -2241,9 +2240,8 @@ int cdrom_get_track_info(kdev_t dev, __u16 track, __u8 type,
 }
 
 /* requires CD R/RW */
-int cdrom_get_disc_info(kdev_t dev, disc_information *di)
+static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information *di)
 {
-       struct cdrom_device_info *cdi = cdrom_find_device(dev);
        struct cdrom_device_ops *cdo = cdi->ops;
        struct cdrom_generic_command cgc;
        int ret;
@@ -2273,9 +2271,8 @@ int cdrom_get_disc_info(kdev_t dev, disc_information *di)
 
 /* return the last written block on the CD-R media. this is for the udf
    file system. */
-int cdrom_get_last_written(kdev_t dev, long *last_written)
-{      
-       struct cdrom_device_info *cdi = cdrom_find_device(dev);
+int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written)
+{
        struct cdrom_tocentry toc;
        disc_information di;
        track_information ti;
@@ -2285,17 +2282,17 @@ int cdrom_get_last_written(kdev_t dev, long *last_written)
        if (!CDROM_CAN(CDC_GENERIC_PACKET))
                goto use_toc;
 
-       if ((ret = cdrom_get_disc_info(dev, &di)))
+       if ((ret = cdrom_get_disc_info(cdi, &di)))
                goto use_toc;
 
        last_track = (di.last_track_msb << 8) | di.last_track_lsb;
-       if ((ret = cdrom_get_track_info(dev, last_track, 1, &ti)))
+       if ((ret = cdrom_get_track_info(cdi, last_track, 1, &ti)))
                goto use_toc;
 
        /* if this track is blank, try the previous. */
        if (ti.blank) {
                last_track--;
-               if ((ret = cdrom_get_track_info(dev, last_track, 1, &ti)))
+               if ((ret = cdrom_get_track_info(cdi, last_track, 1, &ti)))
                        goto use_toc;
        }
 
@@ -2325,9 +2322,8 @@ use_toc:
 }
 
 /* return the next writable block. also for udf file system. */
-int cdrom_get_next_writable(kdev_t dev, long *next_writable)
+static int cdrom_get_next_writable(struct cdrom_device_info *cdi, long *next_writable)
 {
-       struct cdrom_device_info *cdi = cdrom_find_device(dev);
        disc_information di;
        track_information ti;
        __u16 last_track;
@@ -2336,17 +2332,17 @@ int cdrom_get_next_writable(kdev_t dev, long *next_writable)
        if (!CDROM_CAN(CDC_GENERIC_PACKET))
                goto use_last_written;
 
-       if ((ret = cdrom_get_disc_info(dev, &di)))
+       if ((ret = cdrom_get_disc_info(cdi, &di)))
                goto use_last_written;
 
        last_track = (di.last_track_msb << 8) | di.last_track_lsb;
-       if ((ret = cdrom_get_track_info(dev, last_track, 1, &ti)))
+       if ((ret = cdrom_get_track_info(cdi, last_track, 1, &ti)))
                goto use_last_written;
 
         /* if this track is blank, try the previous. */
        if (ti.blank) {
                last_track--;
-               if ((ret = cdrom_get_track_info(dev, last_track, 1, &ti)))
+               if ((ret = cdrom_get_track_info(cdi, last_track, 1, &ti)))
                        goto use_last_written;
        }
 
@@ -2359,7 +2355,7 @@ int cdrom_get_next_writable(kdev_t dev, long *next_writable)
        return 0;
 
 use_last_written:
-       if ((ret = cdrom_get_last_written(dev, next_writable))) {
+       if ((ret = cdrom_get_last_written(cdi, next_writable))) {
                *next_writable = 0;
                return ret;
        } else {
@@ -2368,11 +2364,7 @@ use_last_written:
        }
 }
 
-EXPORT_SYMBOL(cdrom_get_disc_info);
-EXPORT_SYMBOL(cdrom_get_track_info);
-EXPORT_SYMBOL(cdrom_get_next_writable);
 EXPORT_SYMBOL(cdrom_get_last_written);
-EXPORT_SYMBOL(cdrom_count_tracks);
 EXPORT_SYMBOL(register_cdrom);
 EXPORT_SYMBOL(unregister_cdrom);
 EXPORT_SYMBOL(cdrom_open);
@@ -2380,11 +2372,9 @@ EXPORT_SYMBOL(cdrom_release);
 EXPORT_SYMBOL(cdrom_ioctl);
 EXPORT_SYMBOL(cdrom_media_changed);
 EXPORT_SYMBOL(cdrom_number_of_slots);
-EXPORT_SYMBOL(cdrom_select_disc);
 EXPORT_SYMBOL(cdrom_mode_select);
 EXPORT_SYMBOL(cdrom_mode_sense);
 EXPORT_SYMBOL(init_cdrom_command);
-EXPORT_SYMBOL(cdrom_find_device);
 
 #ifdef CONFIG_SYSCTL
 

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 104c928813a4b22a73608dec3dff7d2dee4fb8a7..0e0388efd705c6d98901611461c12a532fbec8e0 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1937,9 +1937,9 @@ static int cdrom_read_tocentry(struct ata_device *drive, int trackno, int msf_fl
 /* Try to read the entire TOC for the disk into our internal buffer. */
 static int cdrom_read_toc(struct ata_device *drive, struct request_sense *sense)
 {
-       int minor, stat, ntracks, i;
-       kdev_t dev;
+       int stat, ntracks, i;
        struct cdrom_info *info = drive->driver_data;
+       struct cdrom_device_info *cdi = &info->devinfo;
        struct atapi_toc *toc = info->toc;
        struct {
                struct atapi_toc_header hdr;
@@ -2071,10 +2071,8 @@ static int cdrom_read_toc(struct ata_device *drive, struct request_sense *sense)
        toc->xa_flag = (ms_tmp.hdr.first_track != ms_tmp.hdr.last_track);
 
        /* Now try to get the total cdrom capacity. */
-       minor = (drive->select.b.unit) << PARTN_BITS;
-       dev = mk_kdev(drive->channel->major, minor);
        /* FIXME: This is making worng assumptions about register layout. */
-       stat = cdrom_get_last_written(dev, (unsigned long *) &toc->capacity);
+       stat = cdrom_get_last_written(cdi, (unsigned long *) &toc->capacity);
        if (stat)
                stat = cdrom_read_capacity(drive, &toc->capacity, sense);
        if (stat)

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 0e28dc69652bc966f256893733463431b837e057..4b06fa27f4a37de8f00a882e9876ff473d5adc31 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -522,8 +522,8 @@ void get_sectorsize(int i)
                SCp->needs_sector_size = 1;
        } else {
 #if 0
-               if (cdrom_get_last_written(mkdev(MAJOR_NR, i),
-                                          &scsi_CDs[i].capacity))
+               if (cdrom_get_last_written(&SCp->cdi,
+                                          &SCp->capacity))
 #endif
                        SCp->capacity = 1 + ((buffer[0] << 24) |
                                                    (buffer[1] << 16) |

diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index b3a349fc341d8b8a02e97cb428c41a3c6f979f71..c73c3c374e5dbcdc814dbab478e8b3cff3600bdb 100644 (file)
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -805,11 +805,8 @@ typedef struct {
     long error;
 } tracktype;
 
-extern void cdrom_count_tracks(struct cdrom_device_info *cdi,tracktype* tracks);
-extern int cdrom_get_next_writable(kdev_t dev, long *next_writable);
-extern int cdrom_get_last_written(kdev_t dev, long *last_written);
+extern int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written);
 extern int cdrom_number_of_slots(struct cdrom_device_info *cdi);
-extern int cdrom_select_disc(struct cdrom_device_info *cdi, int slot);
 extern int cdrom_mode_select(struct cdrom_device_info *cdi,
                             struct cdrom_generic_command *cgc);
 extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
@@ -817,7 +814,6 @@ extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
                            int page_code, int page_control);
 extern void init_cdrom_command(struct cdrom_generic_command *cgc,
                               void *buffer, int len, int type);
-extern struct cdrom_device_info *cdrom_find_device(kdev_t dev);
 
 typedef struct {
        __u16 disc_information_length;
@@ -901,10 +897,6 @@ typedef struct {
        __u32 last_rec_address;
 } track_information;
 
-extern int cdrom_get_disc_info(kdev_t dev, disc_information *di);
-extern int cdrom_get_track_info(kdev_t dev, __u16 track, __u8 type,
-                               track_information *ti);
-
 /* The SCSI spec says there could be 256 slots. */
 #define CDROM_MAX_SLOTS        256