[PATCH] ubd: stop defintining MAJOR_NR

From: Christoph Hellwig
Date: Sat Feb 28 2009 - 16:25:06 EST


MAJOR_NR isn't needed anymore since very early 2.5 kernels.


Signed-off-by: Christoph Hellwig <hch@xxxxxx>

Index: linux-2.6/arch/um/drivers/ubd_kern.c
===================================================================
--- linux-2.6.orig/arch/um/drivers/ubd_kern.c 2009-02-27 17:42:27.624286635 +0100
+++ linux-2.6/arch/um/drivers/ubd_kern.c 2009-02-27 17:43:04.858165103 +0100
@@ -17,7 +17,6 @@
* James McMechan
*/

-#define MAJOR_NR UBD_MAJOR
#define UBD_SHIFT 4

#include "linux/kernel.h"
@@ -115,7 +114,7 @@ static struct block_device_operations ub
};

/* Protected by ubd_lock */
-static int fake_major = MAJOR_NR;
+static int fake_major = UBD_MAJOR;
static struct gendisk *ubd_gendisk[MAX_DEV];
static struct gendisk *fake_gendisk[MAX_DEV];

@@ -299,7 +298,7 @@ static int ubd_setup_common(char *str, i
}

mutex_lock(&ubd_lock);
- if(fake_major != MAJOR_NR){
+ if(fake_major != UBD_MAJOR){
*error_out = "Can't assign a fake major twice";
goto out1;
}
@@ -818,13 +817,13 @@ static int ubd_disk_register(int major,
disk->first_minor = unit << UBD_SHIFT;
disk->fops = &ubd_blops;
set_capacity(disk, size / 512);
- if(major == MAJOR_NR)
+ if(major == UBD_MAJOR)
sprintf(disk->disk_name, "ubd%c", 'a' + unit);
else
sprintf(disk->disk_name, "ubd_fake%d", unit);

/* sysfs register (not for ide fake devices) */
- if (major == MAJOR_NR) {
+ if (major == UBD_MAJOR) {
ubd_devs[unit].pdev.id = unit;
ubd_devs[unit].pdev.name = DRIVER_NAME;
ubd_devs[unit].pdev.dev.release = ubd_device_release;
@@ -871,13 +870,13 @@ static int ubd_add(int n, char **error_o
ubd_dev->queue->queuedata = ubd_dev;

blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG);
- err = ubd_disk_register(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]);
+ err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]);
if(err){
*error_out = "Failed to register device";
goto out_cleanup;
}

- if(fake_major != MAJOR_NR)
+ if(fake_major != UBD_MAJOR)
ubd_disk_register(fake_major, ubd_dev->size, n,
&fake_gendisk[n]);

@@ -1059,10 +1058,10 @@ static int __init ubd_init(void)
char *error;
int i, err;

- if (register_blkdev(MAJOR_NR, "ubd"))
+ if (register_blkdev(UBD_MAJOR, "ubd"))
return -1;

- if (fake_major != MAJOR_NR) {
+ if (fake_major != UBD_MAJOR) {
char name[sizeof("ubd_nnn\0")];

snprintf(name, sizeof(name), "ubd_%d", fake_major);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/