Skip to content

Commit

Permalink
ide-cd: fold cdrom_start_seek into ide_cd_do_request
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Borislav Petkov authored and Bartlomiej Zolnierkiewicz committed Jul 16, 2008
1 parent b6ca440 commit 4b01fcb
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/ide/ide-cd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4b01fcb

Please sign in to comment.