ide-cd: move lba_to_msf() and msf_to_lba() to <linux/cdrom.h>

* Move lba_to_msf() and msf_to_lba() to <linux/cdrom.h>
  (use 'u8' type instead of 'byte' while at it).

* Remove msf_to_lba() copy from drivers/cdrom/cdrom.c.

Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index d290e19845f8..ee52c8a25945 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1664,24 +1664,6 @@ void msf_from_bcd (struct atapi_msf *msf)
         msf->frame  = BCD2BIN(msf->frame);
 }
 
-static inline
-void lba_to_msf (int lba, byte *m, byte *s, byte *f)
-{
-        lba += CD_MSF_OFFSET;
-        lba &= 0xffffff;  /* negative lbas use only 24 bits */
-        *m = lba / (CD_SECS * CD_FRAMES);
-        lba %= (CD_SECS * CD_FRAMES);
-        *s = lba / CD_FRAMES;
-        *f = lba % CD_FRAMES;
-}
-
-
-static inline
-int msf_to_lba (byte m, byte s, byte f)
-{
-        return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
-}
-
 static int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
 {
         struct request req;