queue-4.4/net-ks8851-delay-requesting-irq-until-opened.patch

   1 From d063da3d5d6be8ac9b5d3e8eee812616f05608f5 Mon Sep 17 00:00:00 2001
   2 From: Lukas Wunner <lukas@wunner.de>
   3 Date: Wed, 20 Mar 2019 15:02:00 +0100
   4 Subject: net: ks8851: Delay requesting IRQ until opened
   5
   6 [ Upstream commit d268f31552794abf5b6aa5af31021643411f25f5 ]
   7
   8 The ks8851 driver currently requests the IRQ before registering the
   9 net_device.  Because the net_device name is used as IRQ name and is
  10 still "eth%d" when the IRQ is requested, it's impossibe to tell IRQs
  11 apart if multiple ks8851 chips are present.  Most other drivers delay
  12 requesting the IRQ until the net_device is opened.  Do the same.
  13
  14 The driver doesn't enable interrupts on the chip before opening the
  15 net_device and disables them when closing it, so there doesn't seem to
  16 be a need to request the IRQ already on probe.
  17
  18 Signed-off-by: Lukas Wunner <lukas@wunner.de>
  19 Cc: Frank Pavlic <f.pavlic@kunbus.de>
  20 Cc: Ben Dooks <ben.dooks@codethink.co.uk>
  21 Cc: Tristram Ha <Tristram.Ha@microchip.com>
  22 Signed-off-by: David S. Miller <davem@davemloft.net>
  23 Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
  24 ---
  25  drivers/net/ethernet/micrel/ks8851.c | 24 +++++++++++-------------
  26  1 file changed, 11 insertions(+), 13 deletions(-)
  27
  28 diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
  29 index a8c5641ff955..ff6cab4f6343 100644
  30 --- a/drivers/net/ethernet/micrel/ks8851.c
  31 +++ b/drivers/net/ethernet/micrel/ks8851.c
  32 @@ -797,6 +797,15 @@ static void ks8851_tx_work(struct work_struct *work)
  33  static int ks8851_net_open(struct net_device *dev)
  34  {
  35         struct ks8851_net *ks = netdev_priv(dev);
  36 +       int ret;
  37 +
  38 +       ret = request_threaded_irq(dev->irq, NULL, ks8851_irq,
  39 +                                  IRQF_TRIGGER_LOW | IRQF_ONESHOT,
  40 +                                  dev->name, ks);
  41 +       if (ret < 0) {
  42 +               netdev_err(dev, "failed to get irq\n");
  43 +               return ret;
  44 +       }
  45
  46         /* lock the card, even if we may not actually be doing anything
  47          * else at the moment */
  48 @@ -911,6 +920,8 @@ static int ks8851_net_stop(struct net_device *dev)
  49                 dev_kfree_skb(txb);
  50         }
  51
  52 +       free_irq(dev->irq, ks);
  53 +
  54         return 0;
  55  }
  56
  57 @@ -1542,14 +1553,6 @@ static int ks8851_probe(struct spi_device *spi)
  58         ks8851_read_selftest(ks);
  59         ks8851_init_mac(ks);
  60
  61 -       ret = request_threaded_irq(spi->irq, NULL, ks8851_irq,
  62 -                                  IRQF_TRIGGER_LOW | IRQF_ONESHOT,
  63 -                                  ndev->name, ks);
  64 -       if (ret < 0) {
  65 -               dev_err(&spi->dev, "failed to get irq\n");
  66 -               goto err_irq;
  67 -       }
  68 -
  69         ret = register_netdev(ndev);
  70         if (ret) {
  71                 dev_err(&spi->dev, "failed to register network device\n");
  72 @@ -1562,11 +1565,7 @@ static int ks8851_probe(struct spi_device *spi)
  73
  74         return 0;
  75
  76 -
  77  err_netdev:
  78 -       free_irq(ndev->irq, ks);
  79 -
  80 -err_irq:
  81  err_id:
  82         if (gpio_is_valid(gpio))
  83                 gpio_set_value(gpio, 0);
  84 @@ -1587,7 +1586,6 @@ static int ks8851_remove(struct spi_device *spi)
  85                 dev_info(&spi->dev, "remove\n");
  86
  87         unregister_netdev(priv->netdev);
  88 -       free_irq(spi->irq, priv);
  89         if (gpio_is_valid(priv->gpio))
  90                 gpio_set_value(priv->gpio, 0);
  91         regulator_disable(priv->vdd_reg);
  92 --
  93 2.19.1
  94