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

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

cdrom: Remove unnecessary prototype for cdrom_get_disc_info 



Move the function to the proper spot instead.

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

drivers/cdrom/cdrom.c

+36 −35
Original line number Diff line number Diff line
@@ -338,8 +338,6 @@ do { \ 


/* Not-exported routines. */



static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information *di);



static void cdrom_sysctl_register(void);



static LIST_HEAD(cdrom_list);
@@ -369,6 +367,42 @@ static int cdrom_flush_cache(struct cdrom_device_info *cdi) 
	return cdi->ops->generic_packet(cdi, &cgc);

}



/* requires CD R/RW */

static int cdrom_get_disc_info(struct cdrom_device_info *cdi,

			       disc_information *di)

{

	struct cdrom_device_ops *cdo = cdi->ops;

	struct packet_command cgc;

	int ret, buflen;



	/* set up command and get the disc info */

	init_cdrom_command(&cgc, di, sizeof(*di), CGC_DATA_READ);

	cgc.cmd[0] = GPCMD_READ_DISC_INFO;

	cgc.cmd[8] = cgc.buflen = 2;

	cgc.quiet = 1;



	ret = cdo->generic_packet(cdi, &cgc);

	if (ret)

		return ret;



	/* not all drives have the same disc_info length, so requeue

	 * packet with the length the drive tells us it can supply

	 */

	buflen = be16_to_cpu(di->disc_information_length) +

		sizeof(di->disc_information_length);



	if (buflen > sizeof(disc_information))

		buflen = sizeof(disc_information);



	cgc.cmd[8] = cgc.buflen = buflen;

	ret = cdo->generic_packet(cdi, &cgc);

	if (ret)

		return ret;



	/* return actual fill size */

	return buflen;

}



/* This macro makes sure we don't have to check on cdrom_device_ops

 * existence in the run-time routines below. Change_capability is a

 * hack to have the capability flags defined const, while we can still
@@ -3360,39 +3394,6 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, 
	return -ENOSYS;

}



/* requires CD R/RW */

static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information *di)

{

	struct cdrom_device_ops *cdo = cdi->ops;

	struct packet_command cgc;

	int ret, buflen;



	/* set up command and get the disc info */

	init_cdrom_command(&cgc, di, sizeof(*di), CGC_DATA_READ);

	cgc.cmd[0] = GPCMD_READ_DISC_INFO;

	cgc.cmd[8] = cgc.buflen = 2;

	cgc.quiet = 1;



	if ((ret = cdo->generic_packet(cdi, &cgc)))

		return ret;



	/* not all drives have the same disc_info length, so requeue

	 * packet with the length the drive tells us it can supply

	 */

	buflen = be16_to_cpu(di->disc_information_length) +

		     sizeof(di->disc_information_length);



	if (buflen > sizeof(disc_information))

		buflen = sizeof(disc_information);



	cgc.cmd[8] = cgc.buflen = buflen;

	if ((ret = cdo->generic_packet(cdi, &cgc)))

		return ret;



	/* return actual fill size */

	return buflen;

}



EXPORT_SYMBOL(cdrom_get_last_written);

EXPORT_SYMBOL(register_cdrom);

EXPORT_SYMBOL(unregister_cdrom);