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

cdrom: Remove unnecessary prototype for cdrom_mrw_exit 



Move the function to appropriate locations instead.

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

drivers/cdrom/cdrom.c

+121 −117
Original line number Diff line number Diff line
@@ -338,8 +338,6 @@ do { \ 


/* Not-exported routines. */



static int cdrom_mrw_exit(struct cdrom_device_info *cdi);



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



static void cdrom_sysctl_register(void);
@@ -359,113 +357,29 @@ static int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi, 
	return -EIO;

}



/* 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

 * change it here without gcc complaining at every line.

 */

#define ENSURE(call, bits) if (cdo->call == NULL) *change_capability &= ~(bits)



int register_cdrom(struct cdrom_device_info *cdi)

{

	static char banner_printed;

        struct cdrom_device_ops *cdo = cdi->ops;

        int *change_capability = (int *)&cdo->capability; /* hack */



	cd_dbg(CD_OPEN, "entering register_cdrom\n");



	if (cdo->open == NULL || cdo->release == NULL)

		return -EINVAL;

	if (!banner_printed) {

		pr_info("Uniform CD-ROM driver " REVISION "\n");

		banner_printed = 1;

		cdrom_sysctl_register();

	}



	ENSURE(drive_status, CDC_DRIVE_STATUS );

	if (cdo->check_events == NULL && cdo->media_changed == NULL)

		*change_capability = ~(CDC_MEDIA_CHANGED | CDC_SELECT_DISC);

	ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY);

	ENSURE(lock_door, CDC_LOCK);

	ENSURE(select_speed, CDC_SELECT_SPEED);

	ENSURE(get_last_session, CDC_MULTI_SESSION);

	ENSURE(get_mcn, CDC_MCN);

	ENSURE(reset, CDC_RESET);

	ENSURE(generic_packet, CDC_GENERIC_PACKET);

	cdi->mc_flags = 0;

	cdo->n_minors = 0;

        cdi->options = CDO_USE_FFLAGS;

	

	if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))

		cdi->options |= (int) CDO_AUTO_CLOSE;

	if (autoeject==1 && CDROM_CAN(CDC_OPEN_TRAY))

		cdi->options |= (int) CDO_AUTO_EJECT;

	if (lockdoor==1)

		cdi->options |= (int) CDO_LOCK;

	if (check_media_type==1)

		cdi->options |= (int) CDO_CHECK_TYPE;



	if (CDROM_CAN(CDC_MRW_W))

		cdi->exit = cdrom_mrw_exit;



	if (cdi->disk)

		cdi->cdda_method = CDDA_BPC_FULL;

	else

		cdi->cdda_method = CDDA_OLD;



	if (!cdo->generic_packet)

		cdo->generic_packet = cdrom_dummy_generic_packet;



	cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);

	mutex_lock(&cdrom_mutex);

	list_add(&cdi->list, &cdrom_list);

	mutex_unlock(&cdrom_mutex);

	return 0;

}

#undef ENSURE



void unregister_cdrom(struct cdrom_device_info *cdi)

{

	cd_dbg(CD_OPEN, "entering unregister_cdrom\n");



	mutex_lock(&cdrom_mutex);

	list_del(&cdi->list);

	mutex_unlock(&cdrom_mutex);



	if (cdi->exit)

		cdi->exit(cdi);



	cdi->ops->n_minors--;

	cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);

}



int cdrom_get_media_event(struct cdrom_device_info *cdi,

			  struct media_event_desc *med)

static int cdrom_flush_cache(struct cdrom_device_info *cdi)

{

	struct packet_command cgc;

	unsigned char buffer[8];

	struct event_header *eh = (struct event_header *) buffer;



	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);

	cgc.cmd[0] = GPCMD_GET_EVENT_STATUS_NOTIFICATION;

	cgc.cmd[1] = 1;		/* IMMED */

	cgc.cmd[4] = 1 << 4;	/* media event */

	cgc.cmd[8] = sizeof(buffer);

	cgc.quiet = 1;



	if (cdi->ops->generic_packet(cdi, &cgc))

		return 1;



	if (be16_to_cpu(eh->data_len) < sizeof(*med))

		return 1;

	init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);

	cgc.cmd[0] = GPCMD_FLUSH_CACHE;



	if (eh->nea || eh->notification_class != 0x4)

		return 1;

	cgc.timeout = 5 * 60 * HZ;



	memcpy(med, &buffer[sizeof(*eh)], sizeof(*med));

	return 0;

	return cdi->ops->generic_packet(cdi, &cgc);

}



/* 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

 * change it here without gcc complaining at every line.

 */

#define ENSURE(call, bits)			\

do {						\

	if (cdo->call == NULL)			\

		*change_capability &= ~(bits);	\

} while (0)



/*

 * the first prototypes used 0x2c as the page code for the mrw mode page,

 * subsequently this was changed to 0x03. probe the one used by this drive
@@ -582,18 +496,6 @@ static int cdrom_mrw_bgformat_susp(struct cdrom_device_info *cdi, int immed) 
	return cdi->ops->generic_packet(cdi, &cgc);

}



static int cdrom_flush_cache(struct cdrom_device_info *cdi)

{

	struct packet_command cgc;



	init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);

	cgc.cmd[0] = GPCMD_FLUSH_CACHE;



	cgc.timeout = 5 * 60 * HZ;



	return cdi->ops->generic_packet(cdi, &cgc);

}



static int cdrom_mrw_exit(struct cdrom_device_info *cdi)

{

	disc_information di;
@@ -627,7 +529,8 @@ static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space) 
	cgc.buffer = buffer;

	cgc.buflen = sizeof(buffer);



	if ((ret = cdrom_mode_sense(cdi, &cgc, cdi->mrw_mode_page, 0)))

	ret = cdrom_mode_sense(cdi, &cgc, cdi->mrw_mode_page, 0);

	if (ret)

		return ret;



	mph = (struct mode_page_header *)buffer;
@@ -637,7 +540,8 @@ static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space) 
	buffer[offset + 3] = space;

	cgc.buflen = size;



	if ((ret = cdrom_mode_select(cdi, &cgc)))

	ret = cdrom_mode_select(cdi, &cgc);

	if (ret)

		return ret;



	pr_info("%s: mrw address space %s selected\n",
@@ -645,6 +549,106 @@ static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space) 
	return 0;

}



int register_cdrom(struct cdrom_device_info *cdi)

{

	static char banner_printed;

	struct cdrom_device_ops *cdo = cdi->ops;

	int *change_capability = (int *)&cdo->capability; /* hack */



	cd_dbg(CD_OPEN, "entering register_cdrom\n");



	if (cdo->open == NULL || cdo->release == NULL)

		return -EINVAL;

	if (!banner_printed) {

		pr_info("Uniform CD-ROM driver " REVISION "\n");

		banner_printed = 1;

		cdrom_sysctl_register();

	}



	ENSURE(drive_status, CDC_DRIVE_STATUS);

	if (cdo->check_events == NULL && cdo->media_changed == NULL)

		*change_capability = ~(CDC_MEDIA_CHANGED | CDC_SELECT_DISC);

	ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY);

	ENSURE(lock_door, CDC_LOCK);

	ENSURE(select_speed, CDC_SELECT_SPEED);

	ENSURE(get_last_session, CDC_MULTI_SESSION);

	ENSURE(get_mcn, CDC_MCN);

	ENSURE(reset, CDC_RESET);

	ENSURE(generic_packet, CDC_GENERIC_PACKET);

	cdi->mc_flags = 0;

	cdo->n_minors = 0;

	cdi->options = CDO_USE_FFLAGS;



	if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))

		cdi->options |= (int) CDO_AUTO_CLOSE;

	if (autoeject == 1 && CDROM_CAN(CDC_OPEN_TRAY))

		cdi->options |= (int) CDO_AUTO_EJECT;

	if (lockdoor == 1)

		cdi->options |= (int) CDO_LOCK;

	if (check_media_type == 1)

		cdi->options |= (int) CDO_CHECK_TYPE;



	if (CDROM_CAN(CDC_MRW_W))

		cdi->exit = cdrom_mrw_exit;



	if (cdi->disk)

		cdi->cdda_method = CDDA_BPC_FULL;

	else

		cdi->cdda_method = CDDA_OLD;



	if (!cdo->generic_packet)

		cdo->generic_packet = cdrom_dummy_generic_packet;



	cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);

	mutex_lock(&cdrom_mutex);

	list_add(&cdi->list, &cdrom_list);

	mutex_unlock(&cdrom_mutex);

	return 0;

}

#undef ENSURE



void unregister_cdrom(struct cdrom_device_info *cdi)

{

	cd_dbg(CD_OPEN, "entering unregister_cdrom\n");



	mutex_lock(&cdrom_mutex);

	list_del(&cdi->list);

	mutex_unlock(&cdrom_mutex);



	if (cdi->exit)

		cdi->exit(cdi);



	cdi->ops->n_minors--;

	cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);

}



int cdrom_get_media_event(struct cdrom_device_info *cdi,

			  struct media_event_desc *med)

{

	struct packet_command cgc;

	unsigned char buffer[8];

	struct event_header *eh = (struct event_header *)buffer;



	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);

	cgc.cmd[0] = GPCMD_GET_EVENT_STATUS_NOTIFICATION;

	cgc.cmd[1] = 1;		/* IMMED */

	cgc.cmd[4] = 1 << 4;	/* media event */

	cgc.cmd[8] = sizeof(buffer);

	cgc.quiet = 1;



	if (cdi->ops->generic_packet(cdi, &cgc))

		return 1;



	if (be16_to_cpu(eh->data_len) < sizeof(*med))

		return 1;



	if (eh->nea || eh->notification_class != 0x4)

		return 1;



	memcpy(med, &buffer[sizeof(*eh)], sizeof(*med));

	return 0;

}



static int cdrom_get_random_writable(struct cdrom_device_info *cdi,

			      struct rwrt_feature_desc *rfd)

{