ide-cd: rename cdrom_* functions to ide_cd_*

* cdrom_prepare_request() -> ide_cd_init_rq() * cdrom_queue_packet_command() -> ide_cd_queue_pc() * cdrom_lockdoor() -> ide_cd_lockdoor() * cdrom_read_toc() -> ide_cd_read_toc() * cdrom_get_toc_entry() -> ide_cd_get_toc_entry() This is a preparation to move code handling cdrom.c IOCTLs out of ide-cd.c. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide-cd: rename cdrom_* functions to ide_cd_*
* cdrom_prepare_request() -> ide_cd_init_rq() * cdrom_queue_packet_command() -> ide_cd_queue_pc() * cdrom_lockdoor() -> ide_cd_lockdoor() * cdrom_read_toc() -> ide_cd_read_toc() * cdrom_get_toc_entry() -> ide_cd_get_toc_entry() This is a preparation to move code handling cdrom.c IOCTLs out of ide-cd.c. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz
1 parent 5c937ae4e7
Showing 1 changed file with 44 additions and 39 deletions Side-by-side Diff
drivers/ide/ide-cd.c
@@ -206,7 +206,7 @@
 /*
  * Initialize a ide-cd packet command request
  */
-static void cdrom_prepare_request(ide_drive_t *drive, struct request *rq)
+static void ide_cd_init_rq(ide_drive_t *drive, struct request *rq)
 {
 	struct cdrom_info *cd = drive->driver_data;
  
@@ -225,7 +225,7 @@
 		sense = &info->sense_data;
  
 	/* stuff the sense request in front of our current request */
-	cdrom_prepare_request(drive, rq);
+	ide_cd_init_rq(drive, rq);
  
 	rq->data = sense;
 	rq->cmd[0] = GPCMD_REQUEST_SENSE;
@@ -1168,8 +1168,7 @@
 	return cdrom_start_packet_command(drive, len, cdrom_do_pc_continuation);
 }
  
-
-static int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
+static int ide_cd_queue_pc(ide_drive_t *drive, struct request *rq)
 {
 	struct request_sense sense;
 	int retries = 10;
@@ -1670,7 +1669,7 @@
 	struct cdrom_info *info = drive->driver_data;
 	struct cdrom_device_info *cdi = &info->devinfo;
  
-	cdrom_prepare_request(drive, &req);
+	ide_cd_init_rq(drive, &req);
  
 	req.sense = sense;
 	req.cmd[0] = GPCMD_TEST_UNIT_READY;
  
  
@@ -1682,13 +1681,12 @@
 	 */
 	req.cmd[7] = cdi->sanyo_slot % 3;
  
-	return cdrom_queue_packet_command(drive, &req);
+	return ide_cd_queue_pc(drive, &req);
 }
  
-
 /* Lock the door if LOCKFLAG is nonzero; unlock it otherwise. */
-static int
-cdrom_lockdoor(ide_drive_t *drive, int lockflag, struct request_sense *sense)
+static int ide_cd_lockdoor(ide_drive_t *drive, int lockflag,
+			   struct request_sense *sense)
 {
 	struct cdrom_info *cd = drive->driver_data;
 	struct request_sense my_sense;
  
@@ -1702,11 +1700,11 @@
 	if (cd->cd_flags & IDE_CD_FLAG_NO_DOORLOCK) {
 		stat = 0;
 	} else {
-		cdrom_prepare_request(drive, &req);
+		ide_cd_init_rq(drive, &req);
 		req.sense = sense;
 		req.cmd[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
 		req.cmd[4] = lockflag ? 1 : 0;
-		stat = cdrom_queue_packet_command(drive, &req);
+		stat = ide_cd_queue_pc(drive, &req);
 	}
  
 	/* If we got an illegal field error, the drive
@@ -1752,7 +1750,7 @@
 	if ((cd->cd_flags & IDE_CD_FLAG_DOOR_LOCKED) && ejectflag)
 		return 0;
  
-	cdrom_prepare_request(drive, &req);
+	ide_cd_init_rq(drive, &req);
  
 	/* only tell drive to close tray if open, if it can do that */
 	if (ejectflag && (cdi->mask & CDC_CLOSE_TRAY))
@@ -1761,7 +1759,8 @@
 	req.sense = sense;
 	req.cmd[0] = GPCMD_START_STOP_UNIT;
 	req.cmd[4] = loej | (ejectflag != 0);
-	return cdrom_queue_packet_command(drive, &req);
+
+	return ide_cd_queue_pc(drive, &req);
 }
  
 static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
@@ -1776,7 +1775,7 @@
 	int stat;
 	struct request req;
  
-	cdrom_prepare_request(drive, &req);
+	ide_cd_init_rq(drive, &req);
  
 	req.sense = sense;
 	req.cmd[0] = GPCMD_READ_CDVD_CAPACITY;
@@ -1784,7 +1783,7 @@
 	req.data_len = sizeof(capbuf);
 	req.cmd_flags |= REQ_QUIET;
  
-	stat = cdrom_queue_packet_command(drive, &req);
+	stat = ide_cd_queue_pc(drive, &req);
 	if (stat == 0) {
 		*capacity = 1 + be32_to_cpu(capbuf.lba);
 		*sectors_per_frame =
@@ -1800,7 +1799,7 @@
 {
 	struct request req;
  
-	cdrom_prepare_request(drive, &req);
+	ide_cd_init_rq(drive, &req);
  
 	req.sense = sense;
 	req.data =  buf;
  
@@ -1815,12 +1814,12 @@
 	if (msf_flag)
 		req.cmd[1] = 2;
  
-	return cdrom_queue_packet_command(drive, &req);
+	return ide_cd_queue_pc(drive, &req);
 }
  
  
 /* Try to read the entire TOC for the disk into our internal buffer. */
-static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
+static int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
 {
 	int stat, ntracks, i;
 	struct cdrom_info *info = drive->driver_data;
@@ -1988,7 +1987,7 @@
 	int stat;
  
 	/* Make sure our saved TOC is valid. */
-	stat = cdrom_read_toc(drive, NULL);
+	stat = ide_cd_read_toc(drive, NULL);
 	if (stat)
 		return stat;
  
@@ -1999,7 +1998,7 @@
 	return 0;
 }
  
-static int cdrom_get_toc_entry(ide_drive_t *drive, int track,
+static int ide_cd_get_toc_entry(ide_drive_t *drive, int track,
 				struct atapi_toc_entry **ent)
 {
 	struct cdrom_info *info = drive->driver_data;
@@ -2034,7 +2033,7 @@
 	struct atapi_toc_entry *toce;
 	int stat;
  
-	stat = cdrom_get_toc_entry(drive, tocentry->cdte_track, &toce);
+	stat = ide_cd_get_toc_entry(drive, tocentry->cdte_track, &toce);
 	if (stat)
 		return stat;
  
  
@@ -2060,11 +2059,11 @@
 	struct request rq;
 	struct request_sense sense;
  
-	stat = cdrom_get_toc_entry(drive, ti->cdti_trk0, &first_toc);
+	stat = ide_cd_get_toc_entry(drive, ti->cdti_trk0, &first_toc);
 	if (stat)
 		return stat;
  
-	stat = cdrom_get_toc_entry(drive, ti->cdti_trk1, &last_toc);
+	stat = ide_cd_get_toc_entry(drive, ti->cdti_trk1, &last_toc);
 	if (stat)
 		return stat;
  
  
@@ -2076,14 +2075,14 @@
 	if (lba_end <= lba_start)
 		return -EINVAL;
  
-	cdrom_prepare_request(drive, &rq);
+	ide_cd_init_rq(drive, &rq);
  
 	rq.sense = &sense;
 	rq.cmd[0] = GPCMD_PLAY_AUDIO_MSF;
 	lba_to_msf(lba_start,   &rq.cmd[3], &rq.cmd[4], &rq.cmd[5]);
 	lba_to_msf(lba_end - 1, &rq.cmd[6], &rq.cmd[7], &rq.cmd[8]);
  
-	return cdrom_queue_packet_command(drive, &rq);
+	return ide_cd_queue_pc(drive, &rq);
 }
  
 /* the generic packet interface to cdrom.c */
@@ -2099,7 +2098,7 @@
 	/* here we queue the commands from the uniform CD-ROM
 	   layer. the packet must be complete, as we do not
 	   touch it at all. */
-	cdrom_prepare_request(drive, &req);
+	ide_cd_init_rq(drive, &req);
 	memcpy(req.cmd, cgc->cmd, CDROM_PACKET_SIZE);
 	if (cgc->sense)
 		memset(cgc->sense, 0, sizeof(struct request_sense));
@@ -2111,7 +2110,7 @@
 		req.cmd_flags |= REQ_QUIET;
  
 	req.sense = cgc->sense;
-	cgc->stat = cdrom_queue_packet_command(drive, &req);
+	cgc->stat = ide_cd_queue_pc(drive, &req);
 	if (!cgc->stat)
 		cgc->buflen -= req.data_len;
 	return cgc->stat;
@@ -2147,7 +2146,7 @@
 	struct request req;
 	int ret;
  
-	cdrom_prepare_request(drive, &req);
+	ide_cd_init_rq(drive, &req);
 	req.cmd_type = REQ_TYPE_SPECIAL;
 	req.cmd_flags = REQ_QUIET;
 	ret = ide_do_drive_cmd(drive, &req, ide_wait);
@@ -2157,7 +2156,7 @@
 	 * lock it again.
 	 */
 	if (cd->cd_flags & IDE_CD_FLAG_DOOR_LOCKED)
-		(void) cdrom_lockdoor(drive, 1, &sense);
+		(void)ide_cd_lockdoor(drive, 1, &sense);
  
 	return ret;
 }
@@ -2170,7 +2169,8 @@
 	struct request_sense sense;
  
 	if (position) {
-		int stat = cdrom_lockdoor(drive, 0, &sense);
+		int stat = ide_cd_lockdoor(drive, 0, &sense);
+
 		if (stat)
 			return stat;
 	}
@@ -2182,7 +2182,8 @@
 int ide_cdrom_lock_door (struct cdrom_device_info *cdi, int lock)
 {
 	ide_drive_t *drive = cdi->handle;
-	return cdrom_lockdoor(drive, lock, NULL);
+
+	return ide_cd_lockdoor(drive, lock, NULL);
 }
  
 static int ide_cdrom_get_capabilities(ide_drive_t *drive, u8 *buf)
@@ -2237,7 +2238,7 @@
 	u8 buf[ATAPI_CAPABILITIES_PAGE_SIZE];
 	int stat;
  
-	cdrom_prepare_request(drive, &rq);
+	ide_cd_init_rq(drive, &rq);
  
 	rq.sense = &sense;
  
@@ -2257,7 +2258,7 @@
 		rq.cmd[5] = speed & 0xff;
 	}
  
-	stat = cdrom_queue_packet_command(drive, &rq);
+	stat = ide_cd_queue_pc(drive, &rq);
  
 	if (!ide_cdrom_get_capabilities(drive, buf)) {
 		ide_cdrom_update_speed(drive, buf);
  
@@ -2323,9 +2324,11 @@
 	struct request_sense sense;
 	int ret;
  
-	if ((info->cd_flags & IDE_CD_FLAG_TOC_VALID) == 0 || info->toc == NULL)
-		if ((ret = cdrom_read_toc(drive, &sense)))
+	if ((info->cd_flags & IDE_CD_FLAG_TOC_VALID) == 0 || !info->toc) {
+		ret = ide_cd_read_toc(drive, &sense);
+		if (ret)
 			return ret;
+	}
  
 	toc = info->toc;
 	ms_info->addr.lba = toc->last_session_lba;
@@ -2342,7 +2345,7 @@
 	struct request rq;
 	char buf[24];
  
-	cdrom_prepare_request(drive, &rq);
+	ide_cd_init_rq(drive, &rq);
  
 	rq.data = buf;
 	rq.data_len = sizeof(buf);
@@ -2353,7 +2356,7 @@
 	rq.cmd[3] = 2;		/* format */
 	rq.cmd[8] = sizeof(buf);
  
-	stat = cdrom_queue_packet_command(drive, &rq);
+	stat = ide_cd_queue_pc(drive, &rq);
 	if (stat)
 		return stat;
  
@@ -2937,7 +2940,9 @@
 {
 	struct cdrom_info *info = ide_cd_g(disk);
 	struct request_sense sense;
-	cdrom_read_toc(info->drive, &sense);
+
+	ide_cd_read_toc(info->drive, &sense);
+
 	return  0;
 }
  
@@ -3012,7 +3017,7 @@
 		goto failed;
 	}
  
-	cdrom_read_toc(drive, &sense);
+	ide_cd_read_toc(drive, &sense);
 	g->fops = &idecd_ops;
 	g->flags |= GENHD_FL_REMOVABLE;
 	add_disk(g);
...	...	@@ -206,7 +206,7 @@
206	206	/*
207	207	* Initialize a ide-cd packet command request
208	208	*/
209		-static void cdrom_prepare_request(ide_drive_t drive, struct request rq)
	209	+static void ide_cd_init_rq(ide_drive_t drive, struct request rq)
210	210	{
211	211	struct cdrom_info *cd = drive->driver_data;
212	212
...	...	@@ -225,7 +225,7 @@
225	225	sense = &info->sense_data;
226	226
227	227	/* stuff the sense request in front of our current request */
228		- cdrom_prepare_request(drive, rq);
	228	+ ide_cd_init_rq(drive, rq);
229	229
230	230	rq->data = sense;
231	231	rq->cmd[0] = GPCMD_REQUEST_SENSE;
...	...	@@ -1168,8 +1168,7 @@
1168	1168	return cdrom_start_packet_command(drive, len, cdrom_do_pc_continuation);
1169	1169	}
1170	1170
1171		-
1172		-static int cdrom_queue_packet_command(ide_drive_t drive, struct request rq)
	1171	+static int ide_cd_queue_pc(ide_drive_t drive, struct request rq)
1173	1172	{
1174	1173	struct request_sense sense;
1175	1174	int retries = 10;
...	...	@@ -1670,7 +1669,7 @@
1670	1669	struct cdrom_info *info = drive->driver_data;
1671	1670	struct cdrom_device_info *cdi = &info->devinfo;
1672	1671
1673		- cdrom_prepare_request(drive, &req);
	1672	+ ide_cd_init_rq(drive, &req);
1674	1673
1675	1674	req.sense = sense;
1676	1675	req.cmd[0] = GPCMD_TEST_UNIT_READY;
1677	1676
1678	1677
...	...	@@ -1682,13 +1681,12 @@
1682	1681	*/
1683	1682	req.cmd[7] = cdi->sanyo_slot % 3;
1684	1683
1685		- return cdrom_queue_packet_command(drive, &req);
	1684	+ return ide_cd_queue_pc(drive, &req);
1686	1685	}
1687	1686
1688		-
1689	1687	/* Lock the door if LOCKFLAG is nonzero; unlock it otherwise. */
1690		-static int
1691		-cdrom_lockdoor(ide_drive_t drive, int lockflag, struct request_sense sense)
	1688	+static int ide_cd_lockdoor(ide_drive_t *drive, int lockflag,
	1689	+ struct request_sense *sense)
1692	1690	{
1693	1691	struct cdrom_info *cd = drive->driver_data;
1694	1692	struct request_sense my_sense;
1695	1693
...	...	@@ -1702,11 +1700,11 @@
1702	1700	if (cd->cd_flags & IDE_CD_FLAG_NO_DOORLOCK) {
1703	1701	stat = 0;
1704	1702	} else {
1705		- cdrom_prepare_request(drive, &req);
	1703	+ ide_cd_init_rq(drive, &req);
1706	1704	req.sense = sense;
1707	1705	req.cmd[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
1708	1706	req.cmd[4] = lockflag ? 1 : 0;
1709		- stat = cdrom_queue_packet_command(drive, &req);
	1707	+ stat = ide_cd_queue_pc(drive, &req);
1710	1708	}
1711	1709
1712	1710	/* If we got an illegal field error, the drive
...	...	@@ -1752,7 +1750,7 @@
1752	1750	if ((cd->cd_flags & IDE_CD_FLAG_DOOR_LOCKED) && ejectflag)
1753	1751	return 0;
1754	1752
1755		- cdrom_prepare_request(drive, &req);
	1753	+ ide_cd_init_rq(drive, &req);
1756	1754
1757	1755	/* only tell drive to close tray if open, if it can do that */
1758	1756	if (ejectflag && (cdi->mask & CDC_CLOSE_TRAY))
...	...	@@ -1761,7 +1759,8 @@
1761	1759	req.sense = sense;
1762	1760	req.cmd[0] = GPCMD_START_STOP_UNIT;
1763	1761	req.cmd[4] = loej \| (ejectflag != 0);
1764		- return cdrom_queue_packet_command(drive, &req);
	1762	+
	1763	+ return ide_cd_queue_pc(drive, &req);
1765	1764	}
1766	1765
1767	1766	static int cdrom_read_capacity(ide_drive_t drive, unsigned long capacity,
...	...	@@ -1776,7 +1775,7 @@
1776	1775	int stat;
1777	1776	struct request req;
1778	1777
1779		- cdrom_prepare_request(drive, &req);
	1778	+ ide_cd_init_rq(drive, &req);
1780	1779
1781	1780	req.sense = sense;
1782	1781	req.cmd[0] = GPCMD_READ_CDVD_CAPACITY;
...	...	@@ -1784,7 +1783,7 @@
1784	1783	req.data_len = sizeof(capbuf);
1785	1784	req.cmd_flags \|= REQ_QUIET;
1786	1785
1787		- stat = cdrom_queue_packet_command(drive, &req);
	1786	+ stat = ide_cd_queue_pc(drive, &req);
1788	1787	if (stat == 0) {
1789	1788	*capacity = 1 + be32_to_cpu(capbuf.lba);
1790	1789	*sectors_per_frame =
...	...	@@ -1800,7 +1799,7 @@
1800	1799	{
1801	1800	struct request req;
1802	1801
1803		- cdrom_prepare_request(drive, &req);
	1802	+ ide_cd_init_rq(drive, &req);
1804	1803
1805	1804	req.sense = sense;
1806	1805	req.data = buf;
1807	1806
...	...	@@ -1815,12 +1814,12 @@
1815	1814	if (msf_flag)
1816	1815	req.cmd[1] = 2;
1817	1816
1818		- return cdrom_queue_packet_command(drive, &req);
	1817	+ return ide_cd_queue_pc(drive, &req);
1819	1818	}
1820	1819
1821	1820
1822	1821	/* Try to read the entire TOC for the disk into our internal buffer. */
1823		-static int cdrom_read_toc(ide_drive_t drive, struct request_sense sense)
	1822	+static int ide_cd_read_toc(ide_drive_t drive, struct request_sense sense)
1824	1823	{
1825	1824	int stat, ntracks, i;
1826	1825	struct cdrom_info *info = drive->driver_data;
...	...	@@ -1988,7 +1987,7 @@
1988	1987	int stat;
1989	1988
1990	1989	/* Make sure our saved TOC is valid. */
1991		- stat = cdrom_read_toc(drive, NULL);
	1990	+ stat = ide_cd_read_toc(drive, NULL);
1992	1991	if (stat)
1993	1992	return stat;
1994	1993
...	...	@@ -1999,7 +1998,7 @@
1999	1998	return 0;
2000	1999	}
2001	2000
2002		-static int cdrom_get_toc_entry(ide_drive_t *drive, int track,
	2001	+static int ide_cd_get_toc_entry(ide_drive_t *drive, int track,
2003	2002	struct atapi_toc_entry **ent)
2004	2003	{
2005	2004	struct cdrom_info *info = drive->driver_data;
...	...	@@ -2034,7 +2033,7 @@
2034	2033	struct atapi_toc_entry *toce;
2035	2034	int stat;
2036	2035
2037		- stat = cdrom_get_toc_entry(drive, tocentry->cdte_track, &toce);
	2036	+ stat = ide_cd_get_toc_entry(drive, tocentry->cdte_track, &toce);
2038	2037	if (stat)
2039	2038	return stat;
2040	2039
2041	2040
...	...	@@ -2060,11 +2059,11 @@
2060	2059	struct request rq;
2061	2060	struct request_sense sense;
2062	2061
2063		- stat = cdrom_get_toc_entry(drive, ti->cdti_trk0, &first_toc);
	2062	+ stat = ide_cd_get_toc_entry(drive, ti->cdti_trk0, &first_toc);
2064	2063	if (stat)
2065	2064	return stat;
2066	2065
2067		- stat = cdrom_get_toc_entry(drive, ti->cdti_trk1, &last_toc);
	2066	+ stat = ide_cd_get_toc_entry(drive, ti->cdti_trk1, &last_toc);
2068	2067	if (stat)
2069	2068	return stat;
2070	2069
2071	2070
...	...	@@ -2076,14 +2075,14 @@
2076	2075	if (lba_end <= lba_start)
2077	2076	return -EINVAL;
2078	2077
2079		- cdrom_prepare_request(drive, &rq);
	2078	+ ide_cd_init_rq(drive, &rq);
2080	2079
2081	2080	rq.sense = &sense;
2082	2081	rq.cmd[0] = GPCMD_PLAY_AUDIO_MSF;
2083	2082	lba_to_msf(lba_start, &rq.cmd[3], &rq.cmd[4], &rq.cmd[5]);
2084	2083	lba_to_msf(lba_end - 1, &rq.cmd[6], &rq.cmd[7], &rq.cmd[8]);
2085	2084
2086		- return cdrom_queue_packet_command(drive, &rq);
	2085	+ return ide_cd_queue_pc(drive, &rq);
2087	2086	}
2088	2087
2089	2088	/* the generic packet interface to cdrom.c */
...	...	@@ -2099,7 +2098,7 @@
2099	2098	/* here we queue the commands from the uniform CD-ROM
2100	2099	layer. the packet must be complete, as we do not
2101	2100	touch it at all. */
2102		- cdrom_prepare_request(drive, &req);
	2101	+ ide_cd_init_rq(drive, &req);
2103	2102	memcpy(req.cmd, cgc->cmd, CDROM_PACKET_SIZE);
2104	2103	if (cgc->sense)
2105	2104	memset(cgc->sense, 0, sizeof(struct request_sense));
...	...	@@ -2111,7 +2110,7 @@
2111	2110	req.cmd_flags \|= REQ_QUIET;
2112	2111
2113	2112	req.sense = cgc->sense;
2114		- cgc->stat = cdrom_queue_packet_command(drive, &req);
	2113	+ cgc->stat = ide_cd_queue_pc(drive, &req);
2115	2114	if (!cgc->stat)
2116	2115	cgc->buflen -= req.data_len;
2117	2116	return cgc->stat;
...	...	@@ -2147,7 +2146,7 @@
2147	2146	struct request req;
2148	2147	int ret;
2149	2148
2150		- cdrom_prepare_request(drive, &req);
	2149	+ ide_cd_init_rq(drive, &req);
2151	2150	req.cmd_type = REQ_TYPE_SPECIAL;
2152	2151	req.cmd_flags = REQ_QUIET;
2153	2152	ret = ide_do_drive_cmd(drive, &req, ide_wait);
...	...	@@ -2157,7 +2156,7 @@
2157	2156	* lock it again.
2158	2157	*/
2159	2158	if (cd->cd_flags & IDE_CD_FLAG_DOOR_LOCKED)
2160		- (void) cdrom_lockdoor(drive, 1, &sense);
	2159	+ (void)ide_cd_lockdoor(drive, 1, &sense);
2161	2160
2162	2161	return ret;
2163	2162	}
...	...	@@ -2170,7 +2169,8 @@
2170	2169	struct request_sense sense;
2171	2170
2172	2171	if (position) {
2173		- int stat = cdrom_lockdoor(drive, 0, &sense);
	2172	+ int stat = ide_cd_lockdoor(drive, 0, &sense);
	2173	+
2174	2174	if (stat)
2175	2175	return stat;
2176	2176	}
...	...	@@ -2182,7 +2182,8 @@
2182	2182	int ide_cdrom_lock_door (struct cdrom_device_info *cdi, int lock)
2183	2183	{
2184	2184	ide_drive_t *drive = cdi->handle;
2185		- return cdrom_lockdoor(drive, lock, NULL);
	2185	+
	2186	+ return ide_cd_lockdoor(drive, lock, NULL);
2186	2187	}
2187	2188
2188	2189	static int ide_cdrom_get_capabilities(ide_drive_t drive, u8 buf)
...	...	@@ -2237,7 +2238,7 @@
2237	2238	u8 buf[ATAPI_CAPABILITIES_PAGE_SIZE];
2238	2239	int stat;
2239	2240
2240		- cdrom_prepare_request(drive, &rq);
	2241	+ ide_cd_init_rq(drive, &rq);
2241	2242
2242	2243	rq.sense = &sense;
2243	2244
...	...	@@ -2257,7 +2258,7 @@
2257	2258	rq.cmd[5] = speed & 0xff;
2258	2259	}
2259	2260
2260		- stat = cdrom_queue_packet_command(drive, &rq);
	2261	+ stat = ide_cd_queue_pc(drive, &rq);
2261	2262
2262	2263	if (!ide_cdrom_get_capabilities(drive, buf)) {
2263	2264	ide_cdrom_update_speed(drive, buf);
2264	2265
...	...	@@ -2323,9 +2324,11 @@
2323	2324	struct request_sense sense;
2324	2325	int ret;
2325	2326
2326		- if ((info->cd_flags & IDE_CD_FLAG_TOC_VALID) == 0 \|\| info->toc == NULL)
2327		- if ((ret = cdrom_read_toc(drive, &sense)))
	2327	+ if ((info->cd_flags & IDE_CD_FLAG_TOC_VALID) == 0 \|\| !info->toc) {
	2328	+ ret = ide_cd_read_toc(drive, &sense);
	2329	+ if (ret)
2328	2330	return ret;
	2331	+ }
2329	2332
2330	2333	toc = info->toc;
2331	2334	ms_info->addr.lba = toc->last_session_lba;
...	...	@@ -2342,7 +2345,7 @@
2342	2345	struct request rq;
2343	2346	char buf[24];
2344	2347
2345		- cdrom_prepare_request(drive, &rq);
	2348	+ ide_cd_init_rq(drive, &rq);
2346	2349
2347	2350	rq.data = buf;
2348	2351	rq.data_len = sizeof(buf);
...	...	@@ -2353,7 +2356,7 @@
2353	2356	rq.cmd[3] = 2; /* format */
2354	2357	rq.cmd[8] = sizeof(buf);
2355	2358
2356		- stat = cdrom_queue_packet_command(drive, &rq);
	2359	+ stat = ide_cd_queue_pc(drive, &rq);
2357	2360	if (stat)
2358	2361	return stat;
2359	2362
...	...	@@ -2937,7 +2940,9 @@
2937	2940	{
2938	2941	struct cdrom_info *info = ide_cd_g(disk);
2939	2942	struct request_sense sense;
2940		- cdrom_read_toc(info->drive, &sense);
	2943	+
	2944	+ ide_cd_read_toc(info->drive, &sense);
	2945	+
2941	2946	return 0;
2942	2947	}
2943	2948
...	...	@@ -3012,7 +3017,7 @@
3012	3017	goto failed;
3013	3018	}
3014	3019
3015		- cdrom_read_toc(drive, &sense);
	3020	+ ide_cd_read_toc(drive, &sense);
3016	3021	g->fops = &idecd_ops;
3017	3022	g->flags \|= GENHD_FL_REMOVABLE;
3018	3023	add_disk(g);