scsi: pm80xx: Do not check the address-of value for NULL
authorIgor Pylypiv <ipylypiv@google.com>
Mon, 1 Nov 2021 23:28:23 +0000 (16:28 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 19 Nov 2021 03:26:58 +0000 (22:26 -0500)
Address-of operator cannot return NULL.

Link: https://lore.kernel.org/r/20211101232825.2350233-3-ipylypiv@google.com
Reviewed-by: Vishakha Channapattan <vishakhavc@google.com>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/pm8001/pm8001_hwi.c
drivers/scsi/pm8001/pm80xx_hwi.c

index 124cb69740c67bb06148a503bc1f0e208bdbb298..9f95369bfe7ba7c04cd05a42f9b1c42e8b02717c 100644 (file)
@@ -2304,21 +2304,17 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
 
        psataPayload = (struct sata_completion_resp *)(piomb + 4);
        status = le32_to_cpu(psataPayload->status);
+       param = le32_to_cpu(psataPayload->param);
        tag = le32_to_cpu(psataPayload->tag);
 
        if (!tag) {
                pm8001_dbg(pm8001_ha, FAIL, "tag null\n");
                return;
        }
+
        ccb = &pm8001_ha->ccb_info[tag];
-       param = le32_to_cpu(psataPayload->param);
-       if (ccb) {
-               t = ccb->task;
-               pm8001_dev = ccb->device;
-       } else {
-               pm8001_dbg(pm8001_ha, FAIL, "ccb null\n");
-               return;
-       }
+       t = ccb->task;
+       pm8001_dev = ccb->device;
 
        if (t) {
                if (t->dev && (t->dev->lldd_dev))
@@ -2335,10 +2331,6 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
        }
 
        ts = &t->task_status;
-       if (!ts) {
-               pm8001_dbg(pm8001_ha, FAIL, "ts null\n");
-               return;
-       }
 
        if (status)
                pm8001_dbg(pm8001_ha, IOERR,
@@ -2695,14 +2687,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
        u32 dev_id = le32_to_cpu(psataPayload->device_id);
        unsigned long flags;
 
-       ccb = &pm8001_ha->ccb_info[tag];
-
-       if (ccb) {
-               t = ccb->task;
-               pm8001_dev = ccb->device;
-       } else {
-               pm8001_dbg(pm8001_ha, FAIL, "No CCB !!!. returning\n");
-       }
        if (event)
                pm8001_dbg(pm8001_ha, FAIL, "SATA EVENT 0x%x\n", event);
 
index 88541ca2a629e970637c18f93e7329b8cf9d6d67..b81e8e7160ff54dbf950e7e145475f2a1e96032c 100644 (file)
@@ -2400,21 +2400,17 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha,
 
        psataPayload = (struct sata_completion_resp *)(piomb + 4);
        status = le32_to_cpu(psataPayload->status);
+       param = le32_to_cpu(psataPayload->param);
        tag = le32_to_cpu(psataPayload->tag);
 
        if (!tag) {
                pm8001_dbg(pm8001_ha, FAIL, "tag null\n");
                return;
        }
+
        ccb = &pm8001_ha->ccb_info[tag];
-       param = le32_to_cpu(psataPayload->param);
-       if (ccb) {
-               t = ccb->task;
-               pm8001_dev = ccb->device;
-       } else {
-               pm8001_dbg(pm8001_ha, FAIL, "ccb null\n");
-               return;
-       }
+       t = ccb->task;
+       pm8001_dev = ccb->device;
 
        if (t) {
                if (t->dev && (t->dev->lldd_dev))
@@ -2431,10 +2427,6 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha,
        }
 
        ts = &t->task_status;
-       if (!ts) {
-               pm8001_dbg(pm8001_ha, FAIL, "ts null\n");
-               return;
-       }
 
        if (status != IO_SUCCESS) {
                pm8001_dbg(pm8001_ha, FAIL,
@@ -2830,15 +2822,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha,
        u32 dev_id = le32_to_cpu(psataPayload->device_id);
        unsigned long flags;
 
-       ccb = &pm8001_ha->ccb_info[tag];
-
-       if (ccb) {
-               t = ccb->task;
-               pm8001_dev = ccb->device;
-       } else {
-               pm8001_dbg(pm8001_ha, FAIL, "No CCB !!!. returning\n");
-               return;
-       }
        if (event)
                pm8001_dbg(pm8001_ha, FAIL, "SATA EVENT 0x%x\n", event);
 
@@ -2852,6 +2835,10 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha,
                return;
        }
 
+       ccb = &pm8001_ha->ccb_info[tag];
+       t = ccb->task;
+       pm8001_dev = ccb->device;
+
        if (unlikely(!t || !t->lldd_task || !t->dev)) {
                pm8001_dbg(pm8001_ha, FAIL, "task or dev null\n");
                return;