Commit 6ce6ae7c authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Greg Kroah-Hartman
Browse files

misc: cleanup minor number definitions in c file into miscdevice.h 

HWRNG_MINOR and RNG_MISCDEV_MINOR are duplicate definitions, use
unified HWRNG_MINOR instead and moved into miscdevice.h

ANSLCD_MINOR and LCD_MINOR are duplicate definitions, use unified
LCD_MINOR instead and moved into miscdevice.h

MISCDEV_MINOR is renamed to PXA3XX_GCU_MINOR and moved into
miscdevice.h

Other definitions are just moved without any change.

Link: https://lore.kernel.org/lkml/20200120221323.GJ15860@mit.edu/t/


Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Build-tested-by: default avatarWilly TARREAU <wtarreau@haproxy.com>
Build-tested-by: default avatarMiguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: default avatarZhenzhong Duan <zhenzhong.duan@gmail.com>
Acked-by: default avatarMiguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Link: https://lore.kernel.org/r/20200311071654.335-2-zhenzhong.duan@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c23df7de

arch/um/drivers/random.c

+1 −3
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define RNG_VERSION "1.0.0"

#define RNG_MODULE_NAME "hw_random"



#define RNG_MISCDEV_MINOR		183 /* official */



/* Changed at init time, in the non-modular case, and at module load

 * time, in the module case.  Presumably, the module subsystem

 * protects against a module being loaded twice at the same time.
@@ -104,7 +102,7 @@ static const struct file_operations rng_chrdev_ops = { 


/* rng_init shouldn't be called more than once at boot time */

static struct miscdevice rng_miscdev = {

	RNG_MISCDEV_MINOR,

	HWRNG_MINOR,

	RNG_MODULE_NAME,

	&rng_chrdev_ops,

};

drivers/auxdisplay/charlcd.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


#include "charlcd.h"



#define LCD_MINOR		156



#define DEFAULT_LCD_BWIDTH      40

#define DEFAULT_LCD_HWIDTH      64

drivers/auxdisplay/panel.c

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ 


#include "charlcd.h"



#define KEYPAD_MINOR		185



#define LCD_MAXBYTES		256	/* max burst write */



#define KEYPAD_BUFFER		64

drivers/char/applicom.c

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
#define MAX_BOARD 8		/* maximum of pc board possible */

#define MAX_ISA_BOARD 4

#define LEN_RAM_IO 0x800

#define AC_MINOR 157



#ifndef PCI_VENDOR_ID_APPLICOM

#define PCI_VENDOR_ID_APPLICOM                0x1389

drivers/char/nwbutton.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define NUM_PRESSES_REBOOT 2	/* How many presses to activate shutdown */

#define BUTTON_DELAY 30 	/* How many jiffies for sequence to end */

#define VERSION "0.3"		/* Driver version number */

#define BUTTON_MINOR 158	/* Major 10, Minor 158, /dev/nwbutton */



/* Structure definitions: */

CRA Git | Maintained and supported by SUSTech CRA and CCSE