From 75b944768b0c35c4bfec65e2381ca1bfb5280b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Sat, 3 Aug 2013 23:08:21 +0000
Subject: [PATCH] small DEVICE_START cleanup (nw)

---
 src/emu/machine/tms9901.c    | 2 +-
 src/emu/machine/tms9902.c    | 2 +-
 src/emu/sound/discrete.c     | 2 +-
 src/emu/sound/tms5110.c      | 7 -------
 src/emu/sound/tms5220.c      | 6 ------
 src/mess/drivers/x1.c        | 2 --
 src/mess/machine/68561mpcc.c | 2 +-
 src/mess/machine/8530scc.c   | 2 +-
 8 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/emu/machine/tms9901.c b/src/emu/machine/tms9901.c
index f53238a369f..9a0d2f9e8a5 100644
--- a/src/emu/machine/tms9901.c
+++ b/src/emu/machine/tms9901.c
@@ -517,7 +517,7 @@ void tms9901_device::device_reset(void)
 
 
 /*-------------------------------------------------
-    DEVICE_START( tms9901 )
+    device_start - device-specific startup
 -------------------------------------------------*/
 
 void tms9901_device::device_start(void)
diff --git a/src/emu/machine/tms9902.c b/src/emu/machine/tms9902.c
index 958be808ea7..25132031b07 100644
--- a/src/emu/machine/tms9902.c
+++ b/src/emu/machine/tms9902.c
@@ -819,7 +819,7 @@ void tms9902_device::device_reset()
 }
 
 /*-------------------------------------------------
-    DEVICE_START( tms9902 )
+    device_start - device-specific startup
 -------------------------------------------------*/
 
 void tms9902_device::device_start()
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index e1281dfb853..c3abff7efcc 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -26,7 +26,7 @@
  * Core software takes care of traversing the netlist in the correct
  * order
  *
- * DEVICE_START(discrete)      - Read Node list, initialise & reset
+ * device_start                - Read Node list, initialise & reset
  * device_stop                 - Shutdown discrete sound system
  * device_reset                - Put sound system back to time 0
  * discrete_stream_update()    - This does the real update to the sim
diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c
index 62dcbb0e9f0..f79908c8da0 100644
--- a/src/emu/sound/tms5110.c
+++ b/src/emu/sound/tms5110.c
@@ -869,13 +869,6 @@ void tms5110_device::_speech_rom_set_addr(int addr)
 	m_speech_rom_bitnum = addr * 8 - 1;
 }
 
-/******************************************************************************
-
-     DEVICE_START( tms5110 ) -- allocate buffers and reset the 5110
-
-******************************************************************************/
-
-
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c
index 84c2f4097d2..6ae658c72f9 100644
--- a/src/emu/sound/tms5220.c
+++ b/src/emu/sound/tms5220.c
@@ -1387,12 +1387,6 @@ void tms5220_device::update_ready_state()
 }
 
 
-/**********************************************************************************************
-
-     DEVICE_START( tms5220 ) -- allocate buffers and reset the 5220
-
-***********************************************************************************************/
-
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c
index 433aa8db3e7..c84f3a8b3b6 100644
--- a/src/mess/drivers/x1.c
+++ b/src/mess/drivers/x1.c
@@ -212,8 +212,6 @@
 
 
 
-//static DEVICE_START(x1_daisy){}
-
 /*************************************
  *
  *  Video Functions
diff --git a/src/mess/machine/68561mpcc.c b/src/mess/machine/68561mpcc.c
index 3d90737c9bc..8d2734b2a4e 100644
--- a/src/mess/machine/68561mpcc.c
+++ b/src/mess/machine/68561mpcc.c
@@ -157,7 +157,7 @@ void mpcc68561_t::device_timer(emu_timer &timer, device_timer_id id, int param,
 }
 
 /*-------------------------------------------------
-    DEVICE_START( mpcc68561 )
+    device_start - device-specific startup
 -------------------------------------------------*/
 
 void mpcc68561_t::device_start()
diff --git a/src/mess/machine/8530scc.c b/src/mess/machine/8530scc.c
index 840af49496e..bd4f30965d9 100644
--- a/src/mess/machine/8530scc.c
+++ b/src/mess/machine/8530scc.c
@@ -153,7 +153,7 @@ void scc8530_t::device_timer(emu_timer &timer, device_timer_id id, int param, vo
 }
 
 /*-------------------------------------------------
-    DEVICE_START( scc8530 )
+    device_start - device-specific startup
 -------------------------------------------------*/
 
 void scc8530_t::device_start()