Skip to content

Commit d93e1ac

Browse files
damien-lemoalmartinkpetersen
authored andcommitted
scsi: pm8001: Remove pm80xx_chip_intx_interrupt_enable/disable()
Remove the functions pm80xx_chip_intx_interrupt_enable() and pm80xx_chip_intx_interrupt_disable() and open code them respectively in pm80xx_chip_interrupt_enable() and pm80xx_chip_interrupt_disable(). Signed-off-by: Damien Le Moal <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Jack Wang <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent d6f2f6c commit d93e1ac

File tree

1 file changed

+5
-26
lines changed

1 file changed

+5
-26
lines changed

drivers/scsi/pm8001/pm80xx_hwi.c

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,27 +1714,6 @@ static void pm80xx_hw_chip_rst(struct pm8001_hba_info *pm8001_ha)
17141714
pm8001_dbg(pm8001_ha, INIT, "chip reset finished\n");
17151715
}
17161716

1717-
/**
1718-
* pm80xx_chip_intx_interrupt_enable - enable PM8001 chip interrupt
1719-
* @pm8001_ha: our hba card information
1720-
*/
1721-
static void
1722-
pm80xx_chip_intx_interrupt_enable(struct pm8001_hba_info *pm8001_ha)
1723-
{
1724-
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, ODMR_CLEAR_ALL);
1725-
pm8001_cw32(pm8001_ha, 0, MSGU_ODCR, ODCR_CLEAR_ALL);
1726-
}
1727-
1728-
/**
1729-
* pm80xx_chip_intx_interrupt_disable - disable PM8001 chip interrupt
1730-
* @pm8001_ha: our hba card information
1731-
*/
1732-
static void
1733-
pm80xx_chip_intx_interrupt_disable(struct pm8001_hba_info *pm8001_ha)
1734-
{
1735-
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_CLR, ODMR_MASK_ALL);
1736-
}
1737-
17381717
/**
17391718
* pm80xx_chip_interrupt_enable - enable PM8001 chip interrupt
17401719
* @pm8001_ha: our hba card information
@@ -1749,10 +1728,10 @@ pm80xx_chip_interrupt_enable(struct pm8001_hba_info *pm8001_ha, u8 vec)
17491728
else
17501729
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_CLR_U,
17511730
1U << (vec - 32));
1752-
return;
1731+
#else
1732+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, ODMR_CLEAR_ALL);
1733+
pm8001_cw32(pm8001_ha, 0, MSGU_ODCR, ODCR_CLEAR_ALL);
17531734
#endif
1754-
pm80xx_chip_intx_interrupt_enable(pm8001_ha);
1755-
17561735
}
17571736

17581737
/**
@@ -1773,9 +1752,9 @@ pm80xx_chip_interrupt_disable(struct pm8001_hba_info *pm8001_ha, u8 vec)
17731752
else
17741753
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_U,
17751754
1U << (vec - 32));
1776-
return;
1755+
#else
1756+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_CLR, ODMR_MASK_ALL);
17771757
#endif
1778-
pm80xx_chip_intx_interrupt_disable(pm8001_ha);
17791758
}
17801759

17811760
/**

0 commit comments

Comments
 (0)