Commit 292c04cc authored by Colin Ian King's avatar Colin Ian King Committed by Martin K. Petersen

scsi: pm8001: clean up dead code when PM8001_USE_MSIX is defined

When macro PM8001_USE_MSIX is defined there are redundant dead code calls
to pm8001_chip_intx_interrupt_{enable|disable} and pm8001_cr32.

Clean this up for the defined PM8001_USE_MSIX and undefined
PM8001_USE_MSIX cases.

[mkp: squashed two patches]
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Reviewed-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f99b77e0
...@@ -1204,6 +1204,7 @@ void pm8001_chip_iounmap(struct pm8001_hba_info *pm8001_ha) ...@@ -1204,6 +1204,7 @@ void pm8001_chip_iounmap(struct pm8001_hba_info *pm8001_ha)
} }
} }
#ifndef PM8001_USE_MSIX
/** /**
* pm8001_chip_interrupt_enable - enable PM8001 chip interrupt * pm8001_chip_interrupt_enable - enable PM8001 chip interrupt
* @pm8001_ha: our hba card information * @pm8001_ha: our hba card information
...@@ -1225,6 +1226,8 @@ pm8001_chip_intx_interrupt_disable(struct pm8001_hba_info *pm8001_ha) ...@@ -1225,6 +1226,8 @@ pm8001_chip_intx_interrupt_disable(struct pm8001_hba_info *pm8001_ha)
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, ODMR_MASK_ALL); pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, ODMR_MASK_ALL);
} }
#else
/** /**
* pm8001_chip_msix_interrupt_enable - enable PM8001 chip interrupt * pm8001_chip_msix_interrupt_enable - enable PM8001 chip interrupt
* @pm8001_ha: our hba card information * @pm8001_ha: our hba card information
...@@ -1256,6 +1259,7 @@ pm8001_chip_msix_interrupt_disable(struct pm8001_hba_info *pm8001_ha, ...@@ -1256,6 +1259,7 @@ pm8001_chip_msix_interrupt_disable(struct pm8001_hba_info *pm8001_ha,
msi_index += MSIX_TABLE_BASE; msi_index += MSIX_TABLE_BASE;
pm8001_cw32(pm8001_ha, 0, msi_index, MSIX_INTERRUPT_DISABLE); pm8001_cw32(pm8001_ha, 0, msi_index, MSIX_INTERRUPT_DISABLE);
} }
#endif
/** /**
* pm8001_chip_interrupt_enable - enable PM8001 chip interrupt * pm8001_chip_interrupt_enable - enable PM8001 chip interrupt
...@@ -1266,10 +1270,9 @@ pm8001_chip_interrupt_enable(struct pm8001_hba_info *pm8001_ha, u8 vec) ...@@ -1266,10 +1270,9 @@ pm8001_chip_interrupt_enable(struct pm8001_hba_info *pm8001_ha, u8 vec)
{ {
#ifdef PM8001_USE_MSIX #ifdef PM8001_USE_MSIX
pm8001_chip_msix_interrupt_enable(pm8001_ha, 0); pm8001_chip_msix_interrupt_enable(pm8001_ha, 0);
return; #else
#endif
pm8001_chip_intx_interrupt_enable(pm8001_ha); pm8001_chip_intx_interrupt_enable(pm8001_ha);
#endif
} }
/** /**
...@@ -1281,10 +1284,9 @@ pm8001_chip_interrupt_disable(struct pm8001_hba_info *pm8001_ha, u8 vec) ...@@ -1281,10 +1284,9 @@ pm8001_chip_interrupt_disable(struct pm8001_hba_info *pm8001_ha, u8 vec)
{ {
#ifdef PM8001_USE_MSIX #ifdef PM8001_USE_MSIX
pm8001_chip_msix_interrupt_disable(pm8001_ha, 0); pm8001_chip_msix_interrupt_disable(pm8001_ha, 0);
return; #else
#endif
pm8001_chip_intx_interrupt_disable(pm8001_ha); pm8001_chip_intx_interrupt_disable(pm8001_ha);
#endif
} }
/** /**
...@@ -4625,15 +4627,16 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, ...@@ -4625,15 +4627,16 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha) static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha)
{ {
u32 value;
#ifdef PM8001_USE_MSIX #ifdef PM8001_USE_MSIX
return 1; return 1;
#endif #else
u32 value;
value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR); value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR);
if (value) if (value)
return 1; return 1;
return 0; return 0;
#endif
} }
/** /**
......
...@@ -4619,15 +4619,16 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, ...@@ -4619,15 +4619,16 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha) static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha)
{ {
u32 value;
#ifdef PM8001_USE_MSIX #ifdef PM8001_USE_MSIX
return 1; return 1;
#endif #else
u32 value;
value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR); value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR);
if (value) if (value)
return 1; return 1;
return 0; return 0;
#endif
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment