Messages in this thread | | | Subject | Re: [PATCH v2 1/2] misc: cleanup minor number definitions in c file into miscdevice.h | From | Bartlomiej Zolnierkiewicz <> | Date | Fri, 20 Mar 2020 11:21:52 +0100 |
| |
On 3/11/20 8:16 AM, Zhenzhong Duan wrote: > 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://protect2.fireeye.com/url?k=5cdcd693-0116e324-5cdd5ddc-0cc47a3003e8-9aee128ff3e02503&u=https://lore.kernel.org/lkml/20200120221323.GJ15860@mit.edu/t/ > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Build-tested-by: Willy TARREAU <wtarreau@haproxy.com> > Build-tested-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> > Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com> > Acked-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> > Acked-by: Arnd Bergmann <arnd@arndb.de> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
> --- > arch/um/drivers/random.c | 4 +--- > drivers/auxdisplay/charlcd.c | 2 -- > drivers/auxdisplay/panel.c | 2 -- > drivers/char/applicom.c | 1 - > drivers/char/nwbutton.h | 1 - > drivers/char/toshiba.c | 2 -- > drivers/macintosh/ans-lcd.c | 2 +- > drivers/macintosh/ans-lcd.h | 2 -- > drivers/macintosh/via-pmu.c | 3 --- > drivers/sbus/char/envctrl.c | 2 -- > drivers/sbus/char/uctrl.c | 2 -- > drivers/video/fbdev/pxa3xx-gcu.c | 7 +++---- > include/linux/miscdevice.h | 10 ++++++++++ > kernel/power/user.c | 2 -- > 14 files changed, 15 insertions(+), 27 deletions(-) > > diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c > index 1d5d305..ce115fc 100644 > --- a/arch/um/drivers/random.c > +++ b/arch/um/drivers/random.c > @@ -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 ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size, > > /* 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, > }; > diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c > index c0da382..d58278a 100644 > --- a/drivers/auxdisplay/charlcd.c > +++ b/drivers/auxdisplay/charlcd.c > @@ -22,8 +22,6 @@ > > #include "charlcd.h" > > -#define LCD_MINOR 156 > - > #define DEFAULT_LCD_BWIDTH 40 > #define DEFAULT_LCD_HWIDTH 64 > > diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c > index 85965953..99980aa 100644 > --- a/drivers/auxdisplay/panel.c > +++ b/drivers/auxdisplay/panel.c > @@ -57,8 +57,6 @@ > > #include "charlcd.h" > > -#define KEYPAD_MINOR 185 > - > #define LCD_MAXBYTES 256 /* max burst write */ > > #define KEYPAD_BUFFER 64 > diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c > index 51121a4..14b2d80 100644 > --- a/drivers/char/applicom.c > +++ b/drivers/char/applicom.c > @@ -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 > diff --git a/drivers/char/nwbutton.h b/drivers/char/nwbutton.h > index 9dedfd7..f2b9fdc 100644 > --- a/drivers/char/nwbutton.h > +++ b/drivers/char/nwbutton.h > @@ -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: */ > > diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c > index 98f3150..aff0a8e 100644 > --- a/drivers/char/toshiba.c > +++ b/drivers/char/toshiba.c > @@ -61,8 +61,6 @@ > #include <linux/mutex.h> > #include <linux/toshiba.h> > > -#define TOSH_MINOR_DEV 181 > - > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Jonathan Buzzard <jonathan@buzzard.org.uk>"); > MODULE_DESCRIPTION("Toshiba laptop SMM driver"); > diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c > index b1314d1..b4821c7 100644 > --- a/drivers/macintosh/ans-lcd.c > +++ b/drivers/macintosh/ans-lcd.c > @@ -142,7 +142,7 @@ > }; > > static struct miscdevice anslcd_dev = { > - ANSLCD_MINOR, > + LCD_MINOR, > "anslcd", > &anslcd_fops > }; > diff --git a/drivers/macintosh/ans-lcd.h b/drivers/macintosh/ans-lcd.h > index f0a6e4c..bca7d76 100644 > --- a/drivers/macintosh/ans-lcd.h > +++ b/drivers/macintosh/ans-lcd.h > @@ -2,8 +2,6 @@ > #ifndef _PPC_ANS_LCD_H > #define _PPC_ANS_LCD_H > > -#define ANSLCD_MINOR 156 > - > #define ANSLCD_CLEAR 0x01 > #define ANSLCD_SENDCTRL 0x02 > #define ANSLCD_SETSHORTDELAY 0x03 > diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c > index d38fb78..83eb05b 100644 > --- a/drivers/macintosh/via-pmu.c > +++ b/drivers/macintosh/via-pmu.c > @@ -75,9 +75,6 @@ > /* Some compile options */ > #undef DEBUG_SLEEP > > -/* Misc minor number allocated for /dev/pmu */ > -#define PMU_MINOR 154 > - > /* How many iterations between battery polls */ > #define BATTERY_POLLING_COUNT 2 > > diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c > index 12d66aa..843e830 100644 > --- a/drivers/sbus/char/envctrl.c > +++ b/drivers/sbus/char/envctrl.c > @@ -37,8 +37,6 @@ > #define DRIVER_NAME "envctrl" > #define PFX DRIVER_NAME ": " > > -#define ENVCTRL_MINOR 162 > - > #define PCF8584_ADDRESS 0x55 > > #define CONTROL_PIN 0x80 > diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c > index 7173a2e..37d252f2 100644 > --- a/drivers/sbus/char/uctrl.c > +++ b/drivers/sbus/char/uctrl.c > @@ -23,8 +23,6 @@ > #include <asm/io.h> > #include <asm/pgtable.h> > > -#define UCTRL_MINOR 174 > - > #define DEBUG 1 > #ifdef DEBUG > #define dprintk(x) printk x > diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c > index 74ffb44..4279e13 100644 > --- a/drivers/video/fbdev/pxa3xx-gcu.c > +++ b/drivers/video/fbdev/pxa3xx-gcu.c > @@ -36,7 +36,6 @@ > #include "pxa3xx-gcu.h" > > #define DRV_NAME "pxa3xx-gcu" > -#define MISCDEV_MINOR 197 > > #define REG_GCCR 0x00 > #define GCCR_SYNC_CLR (1 << 9) > @@ -595,7 +594,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev) > * container_of(). This isn't really necessary as we have a fixed minor > * number anyway, but this is to avoid statics. */ > > - priv->misc_dev.minor = MISCDEV_MINOR, > + priv->misc_dev.minor = PXA3XX_GCU_MINOR, > priv->misc_dev.name = DRV_NAME, > priv->misc_dev.fops = &pxa3xx_gcu_miscdev_fops; > > @@ -638,7 +637,7 @@ static int pxa3xx_gcu_probe(struct platform_device *pdev) > ret = misc_register(&priv->misc_dev); > if (ret < 0) { > dev_err(dev, "misc_register() for minor %d failed\n", > - MISCDEV_MINOR); > + PXA3XX_GCU_MINOR); > goto err_free_dma; > } > > @@ -714,7 +713,7 @@ static int pxa3xx_gcu_remove(struct platform_device *pdev) > > MODULE_DESCRIPTION("PXA3xx graphics controller unit driver"); > MODULE_LICENSE("GPL"); > -MODULE_ALIAS_MISCDEV(MISCDEV_MINOR); > +MODULE_ALIAS_MISCDEV(PXA3XX_GCU_MINOR); > MODULE_AUTHOR("Janine Kropp <nin@directfb.org>, " > "Denis Oliver Kropp <dok@directfb.org>, " > "Daniel Mack <daniel@caiaq.de>"); > diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h > index becde69..42360fc 100644 > --- a/include/linux/miscdevice.h > +++ b/include/linux/miscdevice.h > @@ -31,14 +31,23 @@ > #define DMAPI_MINOR 140 /* unused */ > #define NVRAM_MINOR 144 > #define SGI_MMTIMER 153 > +#define PMU_MINOR 154 > #define STORE_QUEUE_MINOR 155 /* unused */ > +#define LCD_MINOR 156 > +#define AC_MINOR 157 > +#define BUTTON_MINOR 158 /* Major 10, Minor 158, /dev/nwbutton */ > +#define ENVCTRL_MINOR 162 > #define I2O_MINOR 166 > +#define UCTRL_MINOR 174 > #define AGPGART_MINOR 175 > +#define TOSH_MINOR_DEV 181 > #define HWRNG_MINOR 183 > #define MICROCODE_MINOR 184 > +#define KEYPAD_MINOR 185 > #define IRNET_MINOR 187 > #define D7S_MINOR 193 > #define VFIO_MINOR 196 > +#define PXA3XX_GCU_MINOR 197 > #define TUN_MINOR 200 > #define CUSE_MINOR 203 > #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ > @@ -49,6 +58,7 @@ > #define MISC_MCELOG_MINOR 227 > #define HPET_MINOR 228 > #define FUSE_MINOR 229 > +#define SNAPSHOT_MINOR 231 > #define KVM_MINOR 232 > #define BTRFS_MINOR 234 > #define AUTOFS_MINOR 235 > diff --git a/kernel/power/user.c b/kernel/power/user.c > index 7743895..98fb659 100644 > --- a/kernel/power/user.c > +++ b/kernel/power/user.c > @@ -27,8 +27,6 @@ > #include "power.h" > > > -#define SNAPSHOT_MINOR 231 > - > static struct snapshot_data { > struct snapshot_handle handle; > int swap; >
| |