Merge tag 'ntb-4.20' of git://github.com/jonmason/ntb

Pull NTB updates from Jon Mason:
 "Fairly minor changes and bug fixes:

  NTB IDT thermal changes and hook into hwmon, ntb_netdev clean-up of
  private struct, and a few bug fixes"

* tag 'ntb-4.20' of git://github.com/jonmason/ntb:
  ntb: idt: Alter the driver info comments
  ntb: idt: Discard temperature sensor IRQ handler
  ntb: idt: Add basic hwmon sysfs interface
  ntb: idt: Alter temperature read method
  ntb_netdev: Simplify remove with client device drvdata
  NTB: transport: Try harder to alloc an aligned MW buffer
  ntb: ntb_transport: Mark expected switch fall-throughs
  ntb: idt: Set PCIe bus address to BARLIMITx
  NTB: ntb_hw_idt: replace IS_ERR_OR_NULL with regular NULL checks
  ntb: intel: fix return value for ndev_vec_mask()
  ntb_netdev: fix sleep time mismatch

1 files changed, 4 insertions, 26 deletions

diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index b12023bc2cab..a5bab614ff84 100644
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -71,7 +71,6 @@ static unsigned int tx_start = 10;
 static unsigned int tx_stop = 5;
 
 struct ntb_netdev {
-        struct list_head list;
         struct pci_dev *pdev;
         struct net_device *ndev;
         struct ntb_transport_qp *qp;
@@ -81,8 +80,6 @@ struct ntb_netdev {
 #define NTB_TX_TIMEOUT_MS       1000
 #define NTB_RXQ_SIZE            100
 
-static LIST_HEAD(dev_list);
-
 static void ntb_netdev_event_handler(void *data, int link_is_up)
 {
         struct net_device *ndev = data;
@@ -236,7 +233,7 @@ static void ntb_netdev_tx_timer(struct timer_list *t)
         struct net_device *ndev = dev->ndev;
 
         if (ntb_transport_tx_free_entry(dev->qp) < tx_stop) {
-                mod_timer(&dev->tx_timer, jiffies + msecs_to_jiffies(tx_time));
+                mod_timer(&dev->tx_timer, jiffies + usecs_to_jiffies(tx_time));
         } else {
                 /* Make sure anybody stopping the queue after this sees the new
                  * value of ntb_transport_tx_free_entry()
@@ -452,7 +449,7 @@ static int ntb_netdev_probe(struct device *client_dev)
         if (rc)
                 goto err1;
 
-        list_add(&dev->list, &dev_list);
+        dev_set_drvdata(client_dev, ndev);
         dev_info(&pdev->dev, "%s created\n", ndev->name);
         return 0;
 
@@ -465,27 +462,8 @@ err:
 
 static void ntb_netdev_remove(struct device *client_dev)
 {
-        struct ntb_dev *ntb;
-        struct net_device *ndev;
-        struct pci_dev *pdev;
-        struct ntb_netdev *dev;
-        bool found = false;
-
-        ntb = dev_ntb(client_dev->parent);
-        pdev = ntb->pdev;
-
-        list_for_each_entry(dev, &dev_list, list) {
-                if (dev->pdev == pdev) {
-                        found = true;
-                        break;
-                }
-        }
-        if (!found)
-                return;
-
-        list_del(&dev->list);
-
-        ndev = dev->ndev;
+        struct net_device *ndev = dev_get_drvdata(client_dev);
+        struct ntb_netdev *dev = netdev_priv(ndev);
 
         unregister_netdev(ndev);
         ntb_transport_free_queue(dev->qp);