ide-cd: fold cdrom_start_seek into ide_cd_do_request

Do what the compiler does anyway: inline a function that is used only once.

This saves us the overhead of a function call and the function is small enough
to be embedded in the callsite anyways.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index b61ce5ee08e22745e4f8beff006b701e4965da6a..66d82c1b16eb7ad6db2cd2f5399b535dbb050808 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -753,14 +753,6 @@ static ide_startstop_t cdrom_start_seek_continuation(ide_drive_t *drive)
        return cdrom_transfer_packet_command(drive, rq, &cdrom_seek_intr);
 }
 
-static void cdrom_start_seek(ide_drive_t *drive)
-{
-       struct cdrom_info *info = drive->driver_data;
-
-       info->dma = 0;
-       info->start_seek = jiffies;
-}
-
 /*
  * Fix up a possibly partially-processed request so that we can start it over
  * entirely, or even put it back on the request queue.
@@ -1219,7 +1211,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                    drive->dsc_overlap) {
                        xferlen = 0;
                        fn = cdrom_start_seek_continuation;
-                       cdrom_start_seek(drive);
+                       info->dma = 0;
+                       info->start_seek = jiffies;
                } else {
                        xferlen = 32768;
                        fn = cdrom_start_rw_cont;