scsi: hisi_sas: Some misc tidy-up

Do some minor tidy-up.

Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index ebeec7a52ddc6ef3b365d24cd7e4bec1f8d21e67..8a7feb8ed8d6d58453b9da9ce0a81fb2091e7cd8 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -683,7 +683,7 @@ static void hisi_sas_bytes_dmaed(struct hisi_hba *hisi_hba, int phy_no)
                id->initiator_bits = SAS_PROTOCOL_ALL;
                id->target_bits = phy->identify.target_port_protocols;
        } else if (phy->phy_type & PORT_TYPE_SATA) {
-               /*Nothing*/
+               /* Nothing */
        }
 
        sas_phy->frame_rcvd_size = phy->frame_rcvd_size;
@@ -1739,7 +1739,7 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun)
        struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
        struct device *dev = hisi_hba->dev;
        struct hisi_sas_tmf_task tmf_task;
-       int rc = TMF_RESP_FUNC_FAILED;
+       int rc;
 
        rc = hisi_sas_internal_task_abort(hisi_hba, device,
                                          HISI_SAS_INT_ABT_DEV, 0);
@@ -2532,22 +2532,19 @@ int hisi_sas_get_fw_info(struct hisi_hba *hisi_hba)
 
                if (device_property_read_u32(dev, "ctrl-reset-reg",
                                             &hisi_hba->ctrl_reset_reg)) {
-                       dev_err(dev,
-                               "could not get property ctrl-reset-reg\n");
+                       dev_err(dev, "could not get property ctrl-reset-reg\n");
                        return -ENOENT;
                }
 
                if (device_property_read_u32(dev, "ctrl-reset-sts-reg",
                                             &hisi_hba->ctrl_reset_sts_reg)) {
-                       dev_err(dev,
-                               "could not get property ctrl-reset-sts-reg\n");
+                       dev_err(dev, "could not get property ctrl-reset-sts-reg\n");
                        return -ENOENT;
                }
 
                if (device_property_read_u32(dev, "ctrl-clock-ena-reg",
                                             &hisi_hba->ctrl_clock_ena_reg)) {
-                       dev_err(dev,
-                               "could not get property ctrl-clock-ena-reg\n");
+                       dev_err(dev, "could not get property ctrl-clock-ena-reg\n");
                        return -ENOENT;
                }
        }

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 717972283acfbac4c270b931292ebb2e3e41a1b0..78fe7d344848589dc9c179b881fa53e1c1877275 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1690,8 +1690,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) {
                        irq = platform_get_irq(pdev, idx);
                        if (!irq) {
-                               dev_err(dev,
-                                       "irq init: fail map phy interrupt %d\n",
+                               dev_err(dev, "irq init: fail map phy interrupt %d\n",
                                        idx);
                                return -ENOENT;
                        }
@@ -1699,8 +1698,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                        rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
                                              DRV_NAME " phy", phy);
                        if (rc) {
-                               dev_err(dev, "irq init: could not request "
-                                       "phy interrupt %d, rc=%d\n",
+                               dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",
                                        irq, rc);
                                return -ENOENT;
                        }
@@ -1737,8 +1735,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
                                      DRV_NAME " fatal", hisi_hba);
                if (rc) {
-                       dev_err(dev,
-                               "irq init: could not request fatal interrupt %d, rc=%d\n",
+                       dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",
                                irq, rc);
                        return -ENOENT;
                }

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 3696cfe485747abb8498d2d055deb4147339be07..d4650bed8274fd05036e7ff0fd4a908f4b52bfa2 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2423,14 +2423,12 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
                        slot_err_v2_hw(hisi_hba, task, slot, 2);
 
                if (ts->stat != SAS_DATA_UNDERRUN)
-                       dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "
-                               "CQ hdr: 0x%x 0x%x 0x%x 0x%x "
-                               "Error info: 0x%x 0x%x 0x%x 0x%x\n",
-                               slot->idx, task, sas_dev->device_id,
-                               complete_hdr->dw0, complete_hdr->dw1,
-                               complete_hdr->act, complete_hdr->dw3,
-                               error_info[0], error_info[1],
-                               error_info[2], error_info[3]);
+                       dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n",
+                                slot->idx, task, sas_dev->device_id,
+                                complete_hdr->dw0, complete_hdr->dw1,
+                                complete_hdr->act, complete_hdr->dw3,
+                                error_info[0], error_info[1],
+                                error_info[2], error_info[3]);
 
                if (unlikely(slot->abort))
                        return ts->stat;
@@ -2502,7 +2500,7 @@ out:
                spin_lock_irqsave(&device->done_lock, flags);
                if (test_bit(SAS_HA_FROZEN, &ha->state)) {
                        spin_unlock_irqrestore(&device->done_lock, flags);
-                       dev_info(dev, "slot complete: task(%p) ignored\n ",
+                       dev_info(dev, "slot complete: task(%p) ignored\n",
                                 task);
                        return sts;
                }
@@ -2935,7 +2933,7 @@ static irqreturn_t int_chnl_int_v2_hw(int irq_no, void *p)
 
                        if (irq_value2 & BIT(CHL_INT2_SL_IDAF_TOUT_CONF_OFF)) {
                                dev_warn(dev, "phy%d identify timeout\n",
-                                               phy_no);
+                                        phy_no);
                                hisi_sas_notify_phy_event(phy,
                                                HISI_PHYE_LINK_RESET);
                        }
@@ -3036,7 +3034,7 @@ static const struct hisi_sas_hw_error axi_error[] = {
        { .msk = BIT(5), .msg = "SATA_AXI_R_ERR" },
        { .msk = BIT(6), .msg = "DQE_AXI_R_ERR" },
        { .msk = BIT(7), .msg = "CQE_AXI_W_ERR" },
-       {},
+       {}
 };
 
 static const struct hisi_sas_hw_error fifo_error[] = {
@@ -3045,7 +3043,7 @@ static const struct hisi_sas_hw_error fifo_error[] = {
        { .msk = BIT(10), .msg = "GETDQE_FIFO" },
        { .msk = BIT(11), .msg = "CMDP_FIFO" },
        { .msk = BIT(12), .msg = "AWTCTRL_FIFO" },
-       {},
+       {}
 };
 
 static const struct hisi_sas_hw_error fatal_axi_errors[] = {
@@ -3109,12 +3107,12 @@ static irqreturn_t fatal_axi_int_v2_hw(int irq_no, void *p)
                                if (!(err_value & sub->msk))
                                        continue;
                                dev_err(dev, "%s (0x%x) found!\n",
-                                        sub->msg, irq_value);
+                                       sub->msg, irq_value);
                                queue_work(hisi_hba->wq, &hisi_hba->rst_work);
                        }
                } else {
                        dev_err(dev, "%s (0x%x) found!\n",
-                                axi_error->msg, irq_value);
+                               axi_error->msg, irq_value);
                        queue_work(hisi_hba->wq, &hisi_hba->rst_work);
                }
        }
@@ -3258,7 +3256,7 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p)
        /* check ERR bit of Status Register */
        if (fis->status & ATA_ERR) {
                dev_warn(dev, "sata int: phy%d FIS status: 0x%x\n", phy_no,
-                               fis->status);
+                        fis->status);
                hisi_sas_notify_phy_event(phy, HISI_PHYE_LINK_RESET);
                res = IRQ_NONE;
                goto end;
@@ -3349,8 +3347,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
                rc = devm_request_irq(dev, irq, phy_interrupts[i], 0,
                                      DRV_NAME " phy", hisi_hba);
                if (rc) {
-                       dev_err(dev, "irq init: could not request "
-                               "phy interrupt %d, rc=%d\n",
+                       dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",
                                irq, rc);
                        rc = -ENOENT;
                        goto free_phy_int_irqs;
@@ -3364,8 +3361,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
                rc = devm_request_irq(dev, irq, sata_int_v2_hw, 0,
                                      DRV_NAME " sata", phy);
                if (rc) {
-                       dev_err(dev, "irq init: could not request "
-                               "sata interrupt %d, rc=%d\n",
+                       dev_err(dev, "irq init: could not request sata interrupt %d, rc=%d\n",
                                irq, rc);
                        rc = -ENOENT;
                        goto free_sata_int_irqs;
@@ -3377,8 +3373,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
                rc = devm_request_irq(dev, irq, fatal_interrupts[fatal_no], 0,
                                      DRV_NAME " fatal", hisi_hba);
                if (rc) {
-                       dev_err(dev,
-                               "irq init: could not request fatal interrupt %d, rc=%d\n",
+                       dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",
                                irq, rc);
                        rc = -ENOENT;
                        goto free_fatal_int_irqs;
@@ -3393,8 +3388,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
                rc = devm_request_irq(dev, irq, cq_interrupt_v2_hw, 0,
                                      DRV_NAME " cq", cq);
                if (rc) {
-                       dev_err(dev,
-                               "irq init: could not request cq interrupt %d, rc=%d\n",
+                       dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",
                                irq, rc);
                        rc = -ENOENT;
                        goto free_cq_int_irqs;
@@ -3546,7 +3540,7 @@ static int write_gpio_v2_hw(struct hisi_hba *hisi_hba, u8 reg_type,
                break;
        default:
                dev_err(dev, "write gpio: unsupported or bad reg type %d\n",
-                               reg_type);
+                       reg_type);
                return -EINVAL;
        }
 

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 9cf46b3d4f1cb73c8657537bfa178e3f60e948bf..49620c2411dfc5298401e478f1926c03aa75160b 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -1010,7 +1010,7 @@ get_free_slot_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_dq *dq)
                                DLVRY_Q_0_RD_PTR + (queue * 0x14));
        if (r == (w+1) % HISI_SAS_QUEUE_SLOTS) {
                dev_warn(dev, "full queue=%d r=%d w=%d\n",
-                               queue, r, w);
+                        queue, r, w);
                return -EAGAIN;
        }
 
@@ -1950,7 +1950,7 @@ static const struct hisi_sas_hw_error axi_error[] = {
        { .msk = BIT(5), .msg = "SATA_AXI_R_ERR" },
        { .msk = BIT(6), .msg = "DQE_AXI_R_ERR" },
        { .msk = BIT(7), .msg = "CQE_AXI_W_ERR" },
-       {},
+       {}
 };
 
 static const struct hisi_sas_hw_error fifo_error[] = {
@@ -1959,7 +1959,7 @@ static const struct hisi_sas_hw_error fifo_error[] = {
        { .msk = BIT(10), .msg = "GETDQE_FIFO" },
        { .msk = BIT(11), .msg = "CMDP_FIFO" },
        { .msk = BIT(12), .msg = "AWTCTRL_FIFO" },
-       {},
+       {}
 };
 
 static const struct hisi_sas_hw_error fatal_axi_error[] = {
@@ -2207,13 +2207,11 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
 
                slot_err_v3_hw(hisi_hba, task, slot);
                if (ts->stat != SAS_DATA_UNDERRUN)
-                       dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "
-                               "CQ hdr: 0x%x 0x%x 0x%x 0x%x "
-                               "Error info: 0x%x 0x%x 0x%x 0x%x\n",
-                               slot->idx, task, sas_dev->device_id,
-                               dw0, dw1, complete_hdr->act, dw3,
-                               error_info[0], error_info[1],
-                               error_info[2], error_info[3]);
+                       dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n",
+                                slot->idx, task, sas_dev->device_id,
+                                dw0, dw1, complete_hdr->act, dw3,
+                                error_info[0], error_info[1],
+                                error_info[2], error_info[3]);
                if (unlikely(slot->abort))
                        return ts->stat;
                goto out;
@@ -2446,8 +2444,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
                                      cq_interrupt_v3_hw, irqflags,
                                      DRV_NAME " cq", cq);
                if (rc) {
-                       dev_err(dev,
-                               "could not request cq%d interrupt, rc=%d\n",
+                       dev_err(dev, "could not request cq%d interrupt, rc=%d\n",
                                i, rc);
                        rc = -ENOENT;
                        goto free_cq_irqs;
@@ -2603,7 +2600,7 @@ static int write_gpio_v3_hw(struct hisi_hba *hisi_hba, u8 reg_type,
                break;
        default:
                dev_err(dev, "write gpio: unsupported or bad reg type %d\n",
-                               reg_type);
+                       reg_type);
                return -EINVAL;
        }
 
@@ -3042,7 +3039,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        hisi_hba->regs = pcim_iomap(pdev, 5, 0);
        if (!hisi_hba->regs) {
-               dev_err(dev, "cannot map register.\n");
+               dev_err(dev, "cannot map register\n");
                rc = -ENOMEM;
                goto err_out_ha;
        }
@@ -3258,7 +3255,7 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev)
        pci_power_t device_state = pdev->current_state;
 
        dev_warn(dev, "resuming from operating state [D%d]\n",
-                       device_state);
+                device_state);
        pci_set_power_state(pdev, PCI_D0);
        pci_enable_wake(pdev, PCI_D0, 0);
        pci_restore_state(pdev);