[PATCH/TRIVIAL] mtd: Use MTD_BLOCK_MAJOR instead of the magic number

[Brian Norris]

On Wed, Oct 9, 2013 at 5:02 AM, Ezequiel Garcia
<ezequiel.garcia at free-electrons.com> wrote:
> On Tue, Oct 08, 2013 at 06:15:21PM -0700, Brian Norris wrote:
>> Why does MTD_BLOCK_MAJOR (and MTD_CHAR_MAJOR) live in
>> include/linux/mtd/mtd.h and not include/uapi/linux/major.h?
>
> Ah, nice catch. How about something like this?
>
> diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
> index f9bfe52..9e1471e 100644
> --- a/include/linux/mtd/mtd.h
> +++ b/include/linux/mtd/mtd.h
> @@ -24,14 +24,12 @@
>  #include <linux/uio.h>
>  #include <linux/notifier.h>
>  #include <linux/device.h>
> +#include <linux/major.h>

I think it's a (weak?) style preference that this type of #include
just go in the files that need it (there are only a few -- 4 I think?)
rather than importing it directly into the mtd.h header for all users.
But I don't object strongly.

>  #include <mtd/mtd-abi.h>
>
>  #include <asm/div64.h>
>
> -#define MTD_CHAR_MAJOR 90
> -#define MTD_BLOCK_MAJOR 31
> -
>  #define MTD_ERASE_PENDING      0x01
>  #define MTD_ERASING            0x02
>  #define MTD_ERASE_SUSPEND      0x04
> diff --git a/include/uapi/linux/major.h b/include/uapi/linux/major.h
> index 6a8ca98..620252e 100644
> --- a/include/uapi/linux/major.h
> +++ b/include/uapi/linux/major.h
> @@ -54,6 +54,7 @@
>  #define ACSI_MAJOR             28
>  #define AZTECH_CDROM_MAJOR     29
>  #define FB_MAJOR               29   /* /dev/fb* framebuffers */
> +#define MTD_BLOCK_MAJOR                31
>  #define CM206_CDROM_MAJOR      32
>  #define IDE2_MAJOR             33
>  #define IDE3_MAJOR             34
> @@ -105,6 +106,7 @@
>  #define IDE6_MAJOR             88
>  #define IDE7_MAJOR             89
>  #define IDE8_MAJOR             90
> +#define MTD_CHAR_MAJOR         90
>  #define IDE9_MAJOR             91
>
>  #define DASD_MAJOR             94
>
> --
>
> If you think this is OK, you can take this patch and I'll cook
> another one moving MTD_xxx_MAJOR as above.

Yeah, the original patch here is good. I'll run it through the build
tests and then apply it. Feel free to send a proper follow-up with
either the diff you just sent or with the #include <linux/major.h>
moved into the appropriate .c files.

Thanks,
Brian