diff mbox series

scsi: pm80xx: Remove unused reset_in_progress flag logic

Message ID 20221007230751.309363-1-ipylypiv@google.com (mailing list archive)
State Accepted
Headers show
Series scsi: pm80xx: Remove unused reset_in_progress flag logic | expand

Commit Message

Igor Pylypiv Oct. 7, 2022, 11:07 p.m. UTC 
The reset_in_progress flag was never set.

Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
Reviewed-by: Andrew Konecki <awkonecki@google.com>
---
 drivers/scsi/pm8001/pm8001_sas.h | 1 -
 drivers/scsi/pm8001/pm80xx_hwi.c | 4 ----
 2 files changed, 5 deletions(-)

Comments

Jinpu Wang Oct. 10, 2022, 5:18 a.m. UTC | #1 
On Sat, Oct 8, 2022 at 1:08 AM Igor Pylypiv <ipylypiv@google.com> wrote:
>
> The reset_in_progress flag was never set.
>
> Signed-off-by: Igor Pylypiv <ipylypiv@google.com>
> Reviewed-by: Andrew Konecki <awkonecki@google.com>
Acked-by: Jack Wang <jinpu.wang@ionos.com>
> ---
>  drivers/scsi/pm8001/pm8001_sas.h | 1 -
>  drivers/scsi/pm8001/pm80xx_hwi.c | 4 ----
>  2 files changed, 5 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
> index b08f52673889..2bbec5083106 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.h
> +++ b/drivers/scsi/pm8001/pm8001_sas.h
> @@ -535,7 +535,6 @@ struct pm8001_hba_info {
>         bool                    controller_fatal_error;
>         const struct firmware   *fw_image;
>         struct isr_param irq_vector[PM8001_MAX_MSIX_VEC];
> -       u32                     reset_in_progress;
>         u32                     non_fatal_count;
>         u32                     non_fatal_read_length;
>         u32 max_q_num;
> diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
> index f8b8624458f7..51c9541f6f4d 100644
> --- a/drivers/scsi/pm8001/pm80xx_hwi.c
> +++ b/drivers/scsi/pm8001/pm80xx_hwi.c
> @@ -3550,10 +3550,6 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
>         case HW_EVENT_PHY_DOWN:
>                 pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_DOWN\n");
>                 hw_event_phy_down(pm8001_ha, piomb);
> -               if (pm8001_ha->reset_in_progress) {
> -                       pm8001_dbg(pm8001_ha, MSG, "Reset in progress\n");
> -                       return 0;
> -               }
>                 phy->phy_attached = 0;
>                 phy->phy_state = PHY_LINK_DISABLE;
>                 break;
> --
> 2.38.0.rc1.362.ged0d419d3c-goog
>
Martin K. Petersen Oct. 22, 2022, 3:07 a.m. UTC | #2 
Igor,

> The reset_in_progress flag was never set.

Applied to 6.2/scsi-staging, thanks!
Martin K. Petersen Oct. 27, 2022, 2:58 a.m. UTC | #3 
On Fri, 7 Oct 2022 16:07:51 -0700, Igor Pylypiv wrote:

> The reset_in_progress flag was never set.
> 
> 

Applied to 6.2/scsi-queue, thanks!

[1/1] scsi: pm80xx: Remove unused reset_in_progress flag logic
      https://git.kernel.org/mkp/scsi/c/5f62639dc2b6
diff mbox series

Patch

diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
index b08f52673889..2bbec5083106 100644
--- a/drivers/scsi/pm8001/pm8001_sas.h
+++ b/drivers/scsi/pm8001/pm8001_sas.h
@@ -535,7 +535,6 @@  struct pm8001_hba_info {
 	bool			controller_fatal_error;
 	const struct firmware 	*fw_image;
 	struct isr_param irq_vector[PM8001_MAX_MSIX_VEC];
-	u32			reset_in_progress;
 	u32			non_fatal_count;
 	u32			non_fatal_read_length;
 	u32 max_q_num;
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index f8b8624458f7..51c9541f6f4d 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -3550,10 +3550,6 @@  static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb)
 	case HW_EVENT_PHY_DOWN:
 		pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_DOWN\n");
 		hw_event_phy_down(pm8001_ha, piomb);
-		if (pm8001_ha->reset_in_progress) {
-			pm8001_dbg(pm8001_ha, MSG, "Reset in progress\n");
-			return 0;
-		}
 		phy->phy_attached = 0;
 		phy->phy_state = PHY_LINK_DISABLE;
 		break;