target/linux/brcm2708/patches-4.19/950-0730-driver-char-rpivid-also-support-legacy-name.patch

   1 From 597375f0bc034cbef2f3ab23a926445f1e7879c4 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Mon, 29 Jul 2019 12:03:21 +0100
   4 Subject: [PATCH 730/773] driver: char: rpivid - also support legacy name
   5
   6 Provide transitional support for the previous names of
   7 the character devices.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  10 ---
  11  drivers/char/broadcom/rpivid-mem.c | 22 ++++++++++++++++++----
  12  1 file changed, 18 insertions(+), 4 deletions(-)
  13
  14 --- a/drivers/char/broadcom/rpivid-mem.c
  15 +++ b/drivers/char/broadcom/rpivid-mem.c
  16 @@ -66,7 +66,7 @@ static int rpivid_mem_open(struct inode
  17         int dev = iminor(inode);
  18         int ret = 0;
  19         struct rpivid_mem_priv *priv;
  20 -       if (dev != DEVICE_MINOR)
  21 +       if (dev != DEVICE_MINOR && dev != DEVICE_MINOR + 1)
  22                 ret = -ENXIO;
  23
  24         priv = container_of(inode->i_cdev, struct rpivid_mem_priv,
  25 @@ -82,7 +82,7 @@ static int rpivid_mem_release(struct ino
  26         int dev = iminor(inode);
  27         int ret = 0;
  28
  29 -       if (dev != DEVICE_MINOR)
  30 +       if (dev != DEVICE_MINOR && dev != DEVICE_MINOR + 1)
  31                 ret = -ENXIO;
  32
  33         return ret;
  34 @@ -167,14 +167,14 @@ static int rpivid_mem_probe(struct platf
  35         /* Create character device entries */
  36
  37         err = alloc_chrdev_region(&priv->devid,
  38 -                                 DEVICE_MINOR, 1, priv->name);
  39 +                                 DEVICE_MINOR, 2, priv->name);
  40         if (err != 0) {
  41                 dev_err(priv->dev, "unable to allocate device number");
  42                 goto failed_alloc_chrdev;
  43         }
  44         cdev_init(&priv->rpivid_mem_cdev, &rpivid_mem_fops);
  45         priv->rpivid_mem_cdev.owner = THIS_MODULE;
  46 -       err = cdev_add(&priv->rpivid_mem_cdev, priv->devid, 1);
  47 +       err = cdev_add(&priv->rpivid_mem_cdev, priv->devid, 2);
  48         if (err != 0) {
  49                 dev_err(priv->dev, "unable to register device");
  50                 goto failed_cdev_add;
  51 @@ -194,6 +194,20 @@ static int rpivid_mem_probe(struct platf
  52         if (IS_ERR(ptr_err))
  53                 goto failed_device_create;
  54
  55 +       /* Legacy alias */
  56 +       {
  57 +               char *oldname = kstrdup(priv->name, GFP_KERNEL);
  58 +
  59 +               oldname[1] = 'a';
  60 +               oldname[2] = 'r';
  61 +               oldname[3] = 'g';
  62 +               oldname[4] = 'o';
  63 +               oldname[5] = 'n';
  64 +               (void)device_create(priv->class, NULL, priv->devid + 1, NULL,
  65 +                                      oldname + 1);
  66 +               kfree(oldname);
  67 +       }
  68 +
  69         dev_info(priv->dev, "%s initialised: Registers at 0x%08lx length 0x%08lx",
  70                 priv->name, priv->regs_phys, priv->mem_window_len);
  71