diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 1726a9b2746..55dbe1e28e0 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -229,21 +229,11 @@ WRITE8_MEMBER( seibu_sound_device::rst18_ack_w )
 	update_irq_lines(RST18_CLEAR);
 }
 
-void seibu_sound_device::ym3812_irqhandler(int linestate)
-{
-	update_irq_lines(linestate ? RST10_ASSERT : RST10_CLEAR);
-}
-
-WRITE_LINE_MEMBER( seibu_sound_device::ym2151_irqhandler )
+WRITE_LINE_MEMBER( seibu_sound_device::fm_irqhandler )
 {
 	update_irq_lines(state ? RST10_ASSERT : RST10_CLEAR);
 }
 
-void seibu_sound_device::ym2203_irqhandler(int linestate)
-{
-	update_irq_lines(linestate ? RST10_ASSERT : RST10_CLEAR);
-}
-
 WRITE8_MEMBER( seibu_sound_device::bank_w )
 {
 	space.machine().root_device().membank("bank1")->set_entry(data & 1);
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index 5e3a003ca10..a59c25a13c3 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -45,17 +45,13 @@ public:
 
 	DECLARE_READ16_MEMBER( main_word_r );
 	DECLARE_WRITE16_MEMBER( main_word_w );
-
 	DECLARE_WRITE16_MEMBER( main_mustb_w );
-
 	DECLARE_WRITE8_MEMBER( irq_clear_w );
 	DECLARE_WRITE8_MEMBER( rst10_ack_w );
 	DECLARE_WRITE8_MEMBER( rst18_ack_w );
 	DECLARE_WRITE8_MEMBER( bank_w );
 	DECLARE_WRITE8_MEMBER( coin_w );
-	void ym3812_irqhandler(int linestate);
-	WRITE_LINE_MEMBER(ym2151_irqhandler);
-	void ym2203_irqhandler(int linestate);
+	WRITE_LINE_MEMBER( fm_irqhandler );
 	DECLARE_READ8_MEMBER( soundlatch_r );
 	DECLARE_READ8_MEMBER( main_data_pending_r );
 	DECLARE_WRITE8_MEMBER( main_data_w );
@@ -193,8 +189,8 @@ extern const device_type SEIBU_ADPCM;
 #define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2)            \
 	MCFG_SPEAKER_STANDARD_MONO("mono")                              \
 																	\
-	MCFG_SOUND_ADD("ymsnd", YM3812, freq1)                              \
-	MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym3812_irqhandler)) \
+	MCFG_SOUND_ADD("ymsnd", YM3812, freq1)                          \
+	MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)                      \
 																	\
 	MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW)              \
@@ -203,8 +199,8 @@ extern const device_type SEIBU_ADPCM;
 #define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2)     \
 	MCFG_SPEAKER_STANDARD_MONO("mono")                              \
 																	\
-	MCFG_SOUND_ADD("ymsnd", YM3812, freq1)                              \
-	MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym3812_irqhandler)) \
+	MCFG_SOUND_ADD("ymsnd", YM3812, freq1)                          \
+	MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)                      \
 																	\
 	MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH)             \
@@ -213,8 +209,8 @@ extern const device_type SEIBU_ADPCM;
 #define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2)            \
 	MCFG_SPEAKER_STANDARD_MONO("mono")                              \
 																	\
-	MCFG_YM2151_ADD("ymsnd", freq1)                             \
-	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler)) \
+	MCFG_YM2151_ADD("ymsnd", freq1)                                 \
+	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
 	MCFG_SOUND_ROUTE(0, "mono", 0.50)                               \
 	MCFG_SOUND_ROUTE(1, "mono", 0.50)                               \
 																	\
@@ -224,16 +220,16 @@ extern const device_type SEIBU_ADPCM;
 #define SEIBU_AIRRAID_SOUND_SYSTEM_YM2151_INTERFACE(freq1)          \
 	MCFG_SPEAKER_STANDARD_MONO("mono")                              \
 																	\
-	MCFG_YM2151_ADD("ymsnd", freq1)                             \
-	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler)) \
+	MCFG_YM2151_ADD("ymsnd", freq1)                                 \
+	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
 	MCFG_SOUND_ROUTE(0, "mono", 0.50)                               \
 	MCFG_SOUND_ROUTE(1, "mono", 0.50)
 
-#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb)       \
+#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1, freq2, regiona, regionb) \
 	MCFG_SPEAKER_STANDARD_MONO("mono")                              \
 																	\
-	MCFG_YM2151_ADD("ymsnd", freq1)                             \
-	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler)) \
+	MCFG_YM2151_ADD("ymsnd", freq1)                                 \
+	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
 	MCFG_SOUND_ROUTE(0, "mono", 0.50)                               \
 	MCFG_SOUND_ROUTE(1, "mono", 0.50)                               \
 																	\
@@ -247,7 +243,7 @@ extern const device_type SEIBU_ADPCM;
 	MCFG_SPEAKER_STANDARD_MONO("mono")                              \
 																	\
 	MCFG_SOUND_ADD("ym1", YM2203, freq)                             \
-	MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2203_irqhandler)) \
+	MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) \
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)                     \
 																	\
 	MCFG_SOUND_ADD("ym2", YM2203, freq)                             \
@@ -255,11 +251,11 @@ extern const device_type SEIBU_ADPCM;
 
 #define SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE                          \
 	MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000)                     \
-	MCFG_SEIBU_ADPCM_ROMREGION("adpcm1")                      \
+	MCFG_SEIBU_ADPCM_ROMREGION("adpcm1")                            \
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)                     \
 																	\
 	MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000)                     \
-	MCFG_SEIBU_ADPCM_ROMREGION("adpcm2")                      \
+	MCFG_SEIBU_ADPCM_ROMREGION("adpcm2")                            \
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 /**************************************************************************/
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 3e26f1452c0..3bd57425a79 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( cabal, cabal_state )
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
 	MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
-	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2151_irqhandler))
+	MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
 
 	MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 762d862b8ef..0286f886821 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -514,7 +514,7 @@ static MACHINE_CONFIG_START( kothello, shanghai_state )
 
 	/* same as standard seibu ym2203, but "ym1" also reads "DSW" */
 	MCFG_SOUND_ADD("ym1", YM2203, XTAL_16MHz/4)
-	MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, ym2203_irqhandler))
+	MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
 	MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)