mtip32xx: remove pointless drvdata lookups

Previously we passed a struct pci_dev * to mtip_check_surprise_removal(),
which immediately looked up the driver_data.  But all callers already have
the driver_data pointer, so just pass it directly and skip the extra
lookup.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20211208192449.146076-3-helgaas@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 715ef35..4c918c9 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -136,16 +136,15 @@ struct mtip_compat_ide_task_request_s {
  * return value
  *      true if device removed, else false
  */
-static bool mtip_check_surprise_removal(struct pci_dev *pdev)
+static bool mtip_check_surprise_removal(struct driver_data *dd)
 {
        u16 vendor_id = 0;
-       struct driver_data *dd = pci_get_drvdata(pdev);
 
        if (dd->sr)
                return true;
 
        /* Read the vendorID from the configuration space */
-       pci_read_config_word(pdev, 0x00, &vendor_id);
+       pci_read_config_word(dd->pdev, 0x00, &vendor_id);
        if (vendor_id == 0xFFFF) {
                dd->sr = true;
                if (dd->queue)
@@ -447,7 +446,7 @@ static int mtip_device_reset(struct driver_data *dd)
 {
        int rv = 0;
 
-       if (mtip_check_surprise_removal(dd->pdev))
+       if (mtip_check_surprise_removal(dd))
                return 0;
 
        if (mtip_hba_reset(dd) < 0)
@@ -727,7 +726,7 @@ static inline void mtip_process_errors(struct driver_data *dd, u32 port_stat)
                dev_warn(&dd->pdev->dev,
                        "Port stat errors %x unhandled\n",
                        (port_stat & ~PORT_IRQ_HANDLED));
-               if (mtip_check_surprise_removal(dd->pdev))
+               if (mtip_check_surprise_removal(dd))
                        return;
        }
        if (likely(port_stat & (PORT_IRQ_TF_ERR | PORT_IRQ_IF_ERR))) {
@@ -752,7 +751,7 @@ static inline irqreturn_t mtip_handle_irq(struct driver_data *data)
                /* Acknowledge the interrupt status on the port.*/
                port_stat = readl(port->mmio + PORT_IRQ_STAT);
                if (unlikely(port_stat == 0xFFFFFFFF)) {
-                       mtip_check_surprise_removal(dd->pdev);
+                       mtip_check_surprise_removal(dd);
                        return IRQ_HANDLED;
                }
                writel(port_stat, port->mmio + PORT_IRQ_STAT);
@@ -796,7 +795,7 @@ static inline irqreturn_t mtip_handle_irq(struct driver_data *data)
                }
 
                if (unlikely(port_stat & PORT_IRQ_ERR)) {
-                       if (unlikely(mtip_check_surprise_removal(dd->pdev))) {
+                       if (unlikely(mtip_check_surprise_removal(dd))) {
                                /* don't proceed further */
                                return IRQ_HANDLED;
                        }
@@ -915,7 +914,7 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)
 
                msleep(100);
 
-               if (mtip_check_surprise_removal(port->dd->pdev))
+               if (mtip_check_surprise_removal(port->dd))
                        goto err_fault;
 
                active = mtip_commands_active(port);
@@ -980,7 +979,7 @@ static int mtip_exec_internal_command(struct mtip_port *port,
                return -EFAULT;
        }
 
-       if (mtip_check_surprise_removal(dd->pdev))
+       if (mtip_check_surprise_removal(dd))
                return -EFAULT;
 
        rq = blk_mq_alloc_request(dd->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_RESERVED);
@@ -1022,7 +1021,7 @@ static int mtip_exec_internal_command(struct mtip_port *port,
                                fis->command, int_cmd->status);
                rv = -EIO;
 
-               if (mtip_check_surprise_removal(dd->pdev) ||
+               if (mtip_check_surprise_removal(dd) ||
                        test_bit(MTIP_DDF_REMOVE_PENDING_BIT,
                                        &dd->dd_flag)) {
                        dev_err(&dd->pdev->dev,
@@ -2513,7 +2512,7 @@ static int mtip_ftl_rebuild_poll(struct driver_data *dd)
                if (unlikely(test_bit(MTIP_DDF_REMOVE_PENDING_BIT,
                                &dd->dd_flag)))
                        return -EFAULT;
-               if (mtip_check_surprise_removal(dd->pdev))
+               if (mtip_check_surprise_removal(dd))
                        return -EFAULT;
 
                if (mtip_get_identify(dd->port, NULL) < 0)
@@ -2891,7 +2890,7 @@ static int mtip_hw_init(struct driver_data *dd)
                 time_before(jiffies, timeout)) {
                mdelay(100);
        }
-       if (unlikely(mtip_check_surprise_removal(dd->pdev))) {
+       if (unlikely(mtip_check_surprise_removal(dd))) {
                timetaken = jiffies - timetaken;
                dev_warn(&dd->pdev->dev,
                        "Surprise removal detected at %u ms\n",
@@ -4098,7 +4097,7 @@ static void mtip_pci_remove(struct pci_dev *pdev)
        list_add(&dd->remove_list, &removing_list);
        spin_unlock_irqrestore(&dev_lock, flags);
 
-       mtip_check_surprise_removal(pdev);
+       mtip_check_surprise_removal(dd);
        synchronize_irq(dd->pdev->irq);
 
        /* Spin until workers are done */