OSDN Git Service

misc: move FLASH_MINOR into miscdevice.h and fix conflicts
authorZhenzhong Duan <zhenzhong.duan@gmail.com>
Wed, 11 Mar 2020 07:16:54 +0000 (15:16 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Mar 2020 11:27:04 +0000 (12:27 +0100)
commit2668dba6df53584fb147d656c45a600d9e723dcb
tree3da9ef7910221f7c31bed831b12017d6b7c44a5f
parent6ce6ae7c178b95f83ca0e15bd2ac961425a3af5c
misc: move FLASH_MINOR into miscdevice.h and fix conflicts

FLASH_MINOR is used in both drivers/char/nwflash.c and
drivers/sbus/char/flash.c with conflict minor numbers.

Move all the definitions of FLASH_MINOR into miscdevice.h.
Rename FLASH_MINOR for drivers/char/nwflash.c to NWFLASH_MINOR
and FLASH_MINOR for drivers/sbus/char/flash.c to SBUS_FLASH_MINOR.

Link: https://lore.kernel.org/lkml/20200120221323.GJ15860@mit.edu/t/
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Link: https://lore.kernel.org/r/20200311071654.335-3-zhenzhong.duan@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/include/asm/nwflash.h
drivers/char/nwflash.c
drivers/sbus/char/flash.c
include/linux/miscdevice.h