speakup: misc: Use dynamic minor numbers for speakup devices

Arnd notes in the link:
   | To clarify: the only numbers that I think should be changed to dynamic
   | allocation are for drivers/staging/speakup. While this is a fairly old
   | subsystem, I would expect that it being staging means we can be a
   | little more progressive with the changes.

This releases misc device minor numbers 25-27 for dynamic usage.

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: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Chris Brannon <chris@the-brannons.com>
Cc: Kirk Reiser <kirk@reisers.ca>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20200325033008.9633-1-zhenzhong.duan@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/speakup/devsynth.c b/drivers/staging/speakup/devsynth.c
index d920256..d305716 100644 (file)
--- a/drivers/staging/speakup/devsynth.c
+++ b/drivers/staging/speakup/devsynth.c
@@ -1,16 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
-#include <linux/miscdevice.h>  /* for misc_register, and SYNTH_MINOR */
+#include <linux/miscdevice.h>  /* for misc_register, and MISC_DYNAMIC_MINOR */
 #include <linux/types.h>
 #include <linux/uaccess.h>
 
 #include "speakup.h"
 #include "spk_priv.h"
 
-#ifndef SYNTH_MINOR
-#define SYNTH_MINOR 25
-#endif
-
 static int misc_registered;
 static int dev_opened;
 
@@ -67,7 +63,7 @@ static const struct file_operations synth_fops = {
 };
 
 static struct miscdevice synth_device = {
-       .minor = SYNTH_MINOR,
+       .minor = MISC_DYNAMIC_MINOR,
        .name = "synth",
        .fops = &synth_fops,
 };
@@ -81,7 +77,7 @@ void speakup_register_devsynth(void)
                pr_warn("Couldn't initialize miscdevice /dev/synth.\n");
        } else {
                pr_info("initialized device: /dev/synth, node (MAJOR %d, MINOR %d)\n",
-                       MISC_MAJOR, SYNTH_MINOR);
+                       MISC_MAJOR, synth_device.minor);
                misc_registered = 1;
        }
 }

diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
index 9d85a3a..eed246f 100644 (file)
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/unistd.h>
-#include <linux/miscdevice.h>  /* for misc_register, and SYNTH_MINOR */
+#include <linux/miscdevice.h>  /* for misc_register, and MISC_DYNAMIC_MINOR */
 #include <linux/poll.h>                /* for poll_wait() */
 
 /* schedule(), signal_pending(), TASK_INTERRUPTIBLE */
@@ -20,8 +20,6 @@
 #include "speakup.h"
 
 #define DRV_VERSION "2.6"
-#define SOFTSYNTH_MINOR 26 /* might as well give it one more than /dev/synth */
-#define SOFTSYNTHU_MINOR 27 /* might as well give it one more than /dev/synth */
 #define PROCSPEECH 0x0d
 #define CLEAR_SYNTH 0x18
 
@@ -375,7 +373,7 @@ static int softsynth_probe(struct spk_synth *synth)
        if (misc_registered != 0)
                return 0;
        memset(&synth_device, 0, sizeof(synth_device));
-       synth_device.minor = SOFTSYNTH_MINOR;
+       synth_device.minor = MISC_DYNAMIC_MINOR;
        synth_device.name = "softsynth";
        synth_device.fops = &softsynth_fops;
        if (misc_register(&synth_device)) {
@@ -384,7 +382,7 @@ static int softsynth_probe(struct spk_synth *synth)
        }
 
        memset(&synthu_device, 0, sizeof(synthu_device));
-       synthu_device.minor = SOFTSYNTHU_MINOR;
+       synthu_device.minor = MISC_DYNAMIC_MINOR;
        synthu_device.name = "softsynthu";
        synthu_device.fops = &softsynthu_fops;
        if (misc_register(&synthu_device)) {
@@ -393,8 +391,10 @@ static int softsynth_probe(struct spk_synth *synth)
        }
 
        misc_registered = 1;
-       pr_info("initialized device: /dev/softsynth, node (MAJOR 10, MINOR 26)\n");
-       pr_info("initialized device: /dev/softsynthu, node (MAJOR 10, MINOR 27)\n");
+       pr_info("initialized device: /dev/softsynth, node (MAJOR 10, MINOR %d)\n",
+               synth_device.minor);
+       pr_info("initialized device: /dev/softsynthu, node (MAJOR 10, MINOR %d)\n",
+               synthu_device.minor);
        return 0;
 }