Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dac1c5cf authored by Joe Perches's avatar Joe Perches Committed by Jens Axboe
Browse files

cdrom: Remove cdrom_get_next_writeable prototype 



Move the function to the right spot instead.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e1e60fda

drivers/cdrom/cdrom.c

+51 −50
Original line number Diff line number Diff line
@@ -338,7 +338,6 @@ do { \ 


/* Not-exported routines. */



static int cdrom_get_next_writable(struct cdrom_device_info *, long *);

static void cdrom_count_tracks(struct cdrom_device_info *, tracktype*);



static int cdrom_mrw_exit(struct cdrom_device_info *cdi);
@@ -2836,6 +2835,57 @@ int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written) 
	return 0;

}



/* return the next writable block. also for udf file system. */

static int cdrom_get_next_writable(struct cdrom_device_info *cdi,

				   long *next_writable)

{

	disc_information di;

	track_information ti;

	__u16 last_track;

	int ret, ti_size;



	if (!CDROM_CAN(CDC_GENERIC_PACKET))

		goto use_last_written;



	ret = cdrom_get_disc_info(cdi, &di);

	if (ret < 0 || ret < offsetof(typeof(di), last_track_lsb)

				+ sizeof(di.last_track_lsb))

		goto use_last_written;



	/* if unit didn't return msb, it's zeroed by cdrom_get_disc_info */

	last_track = (di.last_track_msb << 8) | di.last_track_lsb;

	ti_size = cdrom_get_track_info(cdi, last_track, 1, &ti);

	if (ti_size < 0 || ti_size < offsetof(typeof(ti), track_start))

		goto use_last_written;



	/* if this track is blank, try the previous. */

	if (ti.blank) {

		if (last_track == 1)

			goto use_last_written;

		last_track--;

		ti_size = cdrom_get_track_info(cdi, last_track, 1, &ti);

		if (ti_size < 0)

			goto use_last_written;

	}



	/* if next recordable address field is valid, use it. */

	if (ti.nwa_v && ti_size >= offsetof(typeof(ti), next_writable)

				+ sizeof(ti.next_writable)) {

		*next_writable = be32_to_cpu(ti.next_writable);

		return 0;

	}



use_last_written:

	ret = cdrom_get_last_written(cdi, next_writable);

	if (ret) {

		*next_writable = 0;

		return ret;

	} else {

		*next_writable += 7;

		return 0;

	}

}



static noinline int mmc_ioctl_cdrom_read_data(struct cdrom_device_info *cdi,

					      void __user *arg,

					      struct packet_command *cgc,
@@ -3339,55 +3389,6 @@ static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information * 
	return buflen;

}



/* return the next writable block. also for udf file system. */

static int cdrom_get_next_writable(struct cdrom_device_info *cdi, long *next_writable)

{

	disc_information di;

	track_information ti;

	__u16 last_track;

	int ret, ti_size;



	if (!CDROM_CAN(CDC_GENERIC_PACKET))

		goto use_last_written;



	ret = cdrom_get_disc_info(cdi, &di);

	if (ret < 0 || ret < offsetof(typeof(di), last_track_lsb)

				+ sizeof(di.last_track_lsb))

		goto use_last_written;



	/* if unit didn't return msb, it's zeroed by cdrom_get_disc_info */

	last_track = (di.last_track_msb << 8) | di.last_track_lsb;

	ti_size = cdrom_get_track_info(cdi, last_track, 1, &ti);

	if (ti_size < 0 || ti_size < offsetof(typeof(ti), track_start))

		goto use_last_written;



        /* if this track is blank, try the previous. */

	if (ti.blank) {

		if (last_track == 1)

			goto use_last_written;

		last_track--;

		ti_size = cdrom_get_track_info(cdi, last_track, 1, &ti);

		if (ti_size < 0)

			goto use_last_written;

	}



	/* if next recordable address field is valid, use it. */

	if (ti.nwa_v && ti_size >= offsetof(typeof(ti), next_writable)

				+ sizeof(ti.next_writable)) {

		*next_writable = be32_to_cpu(ti.next_writable);

		return 0;

	}



use_last_written:

	if ((ret = cdrom_get_last_written(cdi, next_writable))) {

		*next_writable = 0;

		return ret;

	} else {

		*next_writable += 7;

		return 0;

	}

}



EXPORT_SYMBOL(cdrom_get_last_written);

EXPORT_SYMBOL(register_cdrom);

EXPORT_SYMBOL(unregister_cdrom);