]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide-tape: remove idetape_increase_max_pipeline_stages()
authorBorislav Petkov <petkovbb@googlemail.com>
Wed, 6 Feb 2008 01:57:52 +0000 (02:57 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 6 Feb 2008 01:57:52 +0000 (02:57 +0100)
This function was being used only at one place so fold it in there.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-tape.c

index 2fe4e8fdf3dada197ebd5c46477aa3b7c4877ffd..27fd33db0a0b418bbbd3668b8240dbe081536b95 100644 (file)
@@ -809,25 +809,6 @@ static void idetape_activate_next_stage(ide_drive_t *drive)
        tape->next_stage = stage->next;
 }
 
-/*
- *     idetape_increase_max_pipeline_stages is a part of the feedback
- *     loop which tries to find the optimum number of stages. In the
- *     feedback loop, we are starting from a minimum maximum number of
- *     stages, and if we sense that the pipeline is empty, we try to
- *     increase it, until we reach the user compile time memory limit.
- */
-static void idetape_increase_max_pipeline_stages (ide_drive_t *drive)
-{
-       idetape_tape_t *tape = drive->driver_data;
-       int increase = (tape->max_pipeline - tape->min_pipeline) / 10;
-
-       debug_log(DBG_PROCS, "Enter %s\n", __func__);
-
-       tape->max_stages += max(increase, 1);
-       tape->max_stages = max(tape->max_stages, tape->min_pipeline);
-       tape->max_stages = min(tape->max_stages, tape->max_pipeline);
-}
-
 /*
  *     idetape_kfree_stage calls kfree to completely free a stage, along with
  *     its related buffers.
@@ -976,7 +957,21 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
                        (void)ide_do_drive_cmd(drive, tape->active_data_rq,
                                                ide_end);
                } else if (!error) {
-                               idetape_increase_max_pipeline_stages(drive);
+                       /*
+                        * This is a part of the feedback loop which tries to
+                        * find the optimum number of stages. We are starting
+                        * from a minimum maximum number of stages, and if we
+                        * sense that the pipeline is empty, we try to increase
+                        * it, until we reach the user compile time memory
+                        * limit.
+                        */
+                       int i = (tape->max_pipeline - tape->min_pipeline) / 10;
+
+                       tape->max_stages += max(i, 1);
+                       tape->max_stages = max(tape->max_stages,
+                                               tape->min_pipeline);
+                       tape->max_stages = min(tape->max_stages,
+                                               tape->max_pipeline);
                }
        }
        ide_end_drive_cmd(drive, 0, 0);