Return int in snd_vt1724_chip_init() is useless since it always
returns 0.
Signed-off-by: Lu Wei <luwei32@xxxxxxxxxx>
---
sound/pci/ice1712/ice1724.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 6fab2ad85bbe..dfef468ad6dc 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2347,7 +2347,7 @@ static void snd_vt1724_chip_reset(struct snd_ice1712 *ice)
msleep(10);
}
-static int snd_vt1724_chip_init(struct snd_ice1712 *ice)
+static void snd_vt1724_chip_init(struct snd_ice1712 *ice)
{
outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG));
outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG));
@@ -2369,8 +2369,6 @@ static int snd_vt1724_chip_init(struct snd_ice1712 *ice)
* since they cause machine lockups
*/
outb(VT1724_MULTI_FIFO_ERR, ICEMT1724(ice, DMA_INT_MASK));
-
- return 0;
}
static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice)
@@ -2506,8 +2504,8 @@ static int snd_vt1724_create(struct snd_card *card,
snd_vt1724_chip_reset(ice);
if (snd_vt1724_read_eeprom(ice, modelname) < 0)
return -EIO;
- if (snd_vt1724_chip_init(ice) < 0)
- return -EIO;
+
+ snd_vt1724_chip_init(ice);
return 0;
}
@@ -2702,11 +2700,7 @@ static int snd_vt1724_resume(struct device *dev)
return 0;
snd_vt1724_chip_reset(ice);
-
- if (snd_vt1724_chip_init(ice) < 0) {
- snd_card_disconnect(card);
- return -EIO;
- }
+ snd_vt1724_chip_init(ice);
if (ice->pm_resume)
ice->pm_resume(ice);
--
2.17.1
