cpuidle-haltpoll: Replace default_idle() with arch_cpu_idle()

[linux-2.6-microblaze.git] / block / bfq-cgroup.c

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 627476b..1b2829e 100644 (file)
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -724,19 +724,19 @@ void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq,
  * sure that the reference to cgroup is valid across the call (see
  * comments in bfq_bic_update_cgroup on this issue)
  */
-static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
-                                    struct bfq_io_cq *bic,
-                                    struct bfq_group *bfqg)
+static void __bfq_bic_change_cgroup(struct bfq_data *bfqd,
+                                   struct bfq_io_cq *bic,
+                                   struct bfq_group *bfqg)
 {
-       struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0);
-       struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1);
+       struct bfq_queue *async_bfqq = bic_to_bfqq(bic, false);
+       struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, true);
        struct bfq_entity *entity;
 
        if (async_bfqq) {
                entity = &async_bfqq->entity;
 
                if (entity->sched_data != &bfqg->sched_data) {
-                       bic_set_bfqq(bic, NULL, 0);
+                       bic_set_bfqq(bic, NULL, false);
                        bfq_release_process_ref(bfqd, async_bfqq);
                }
        }
@@ -772,12 +772,10 @@ static void *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
                                 */
                                bfq_put_cooperator(sync_bfqq);
                                bfq_release_process_ref(bfqd, sync_bfqq);
-                               bic_set_bfqq(bic, NULL, 1);
+                               bic_set_bfqq(bic, NULL, true);
                        }
                }
        }
-
-       return bfqg;
 }
 
 void bfq_bic_update_cgroup(struct bfq_io_cq *bic, struct bio *bio)