xen: simplify balloon_first_page() with list_first_entry_or_null()

Replace the code logic at balloon_first_page() by calling
list_first_entry_or_null() directly.  since here is only
one user of that routine, therefore we can just remove it.

Signed-off-by: Jie Liu <[email protected]>
Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
Reviewed-by: David Vrabel <[email protected]>

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 4c02e2b9410377d9e6b77fe1bc2b50d929774551..37d06ea624aa953d40448bcd2a2d4943baf79fa9 100644 (file)
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -157,13 +157,6 @@ static struct page *balloon_retrieve(bool prefer_highmem)
        return page;
 }
 
        return page;
 }
 

-static struct page *balloon_first_page(void)
-{
-       if (list_empty(&ballooned_pages))
-               return NULL;
-       return list_entry(ballooned_pages.next, struct page, lru);
-}
-

 static struct page *balloon_next_page(struct page *page)
 {
        struct list_head *next = page->lru.next;
 static struct page *balloon_next_page(struct page *page)
 {
        struct list_head *next = page->lru.next;


@@ -328,7 +321,7 @@ static enum bp_state increase_reservation(unsigned long nr_pages)
        if (nr_pages > ARRAY_SIZE(frame_list))
                nr_pages = ARRAY_SIZE(frame_list);
 
        if (nr_pages > ARRAY_SIZE(frame_list))
                nr_pages = ARRAY_SIZE(frame_list);
 

-       page = balloon_first_page();
+       page = list_first_entry_or_null(&ballooned_pages, struct page, lru);

        for (i = 0; i < nr_pages; i++) {
                if (!page) {
                        nr_pages = i;
        for (i = 0; i < nr_pages; i++) {
                if (!page) {
                        nr_pages = i;