PM: mm: cleanup swsusp_swap_check

Use blkdev_get_by_dev instead of bdget + blkdev_get.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 9d3ffbf..71385be 100644 (file)
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -343,12 +343,10 @@ static int swsusp_swap_check(void)
                return res;
        root_swap = res;
 
-       hib_resume_bdev = bdget(swsusp_resume_device);
-       if (!hib_resume_bdev)
-               return -ENOMEM;
-       res = blkdev_get(hib_resume_bdev, FMODE_WRITE, NULL);
-       if (res)
-               return res;
+       hib_resume_bdev = blkdev_get_by_dev(swsusp_resume_device, FMODE_WRITE,
+                       NULL);
+       if (IS_ERR(hib_resume_bdev))
+               return PTR_ERR(hib_resume_bdev);
 
        res = set_blocksize(hib_resume_bdev, PAGE_SIZE);
        if (res < 0)