summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAlexander Viro <viro@math.psu.edu>2002-11-10 16:59:52 -0800
committerAndy Grover <agrover@groveronline.com>2002-11-10 16:59:52 -0800
commitbb05e1aa22aa9d7311843da9b068518843ced12f (patch)
tree3c40a4873b79da493ac004283691984ad4ef76a3 /kernel
parent17d847a185a3514adaf458af533e8a4dce3e037f (diff)
[PATCH] bdevname() cleanups
Bunch of kdevname() uses replaced with bdevname(). __bdevname() switched from kdev_t to dev_t; callers updated.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/suspend.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/suspend.c b/kernel/suspend.c
index 1f2aa93db988..838efbc16787 100644
--- a/kernel/suspend.c
+++ b/kernel/suspend.c
@@ -103,7 +103,7 @@ static int nr_copy_pages_check;
static int resume_status = 0;
static char resume_file[256] = ""; /* For resume= kernel option */
-static kdev_t resume_device;
+static dev_t resume_device;
/* Local variables that should not be affected by save */
unsigned int nr_copy_pages __nosavedata = 0;
@@ -1143,13 +1143,13 @@ static int read_suspend_image(const char * specialfile, int noresume)
unsigned long scratch_page = 0;
int error;
- resume_device = to_kdev_t(name_to_dev_t(specialfile));
+ resume_device = name_to_dev_t(specialfile);
scratch_page = get_zeroed_page(GFP_ATOMIC);
cur = (void *) scratch_page;
if (cur) {
struct block_device *bdev;
printk("Resuming from device %s\n", __bdevname(resume_device));
- bdev = bdget(kdev_t_to_nr(resume_device));
+ bdev = bdget(resume_device);
if (!bdev) {
printk("No such block device ?!\n");
BUG();