1 files changed, 2 insertions, 7 deletions
diff --git a/src/mame/machine/nextmo.h b/src/mame/machine/nextmo.h
index af88f690f9d..543b37a3022 100644
--- a/src/mame/machine/nextmo.h
+++ b/src/mame/machine/nextmo.h
@@ -5,19 +5,14 @@
 
 #pragma once
 
-#define MCFG_NEXTMO_IRQ_CALLBACK(_write) \
-	downcast<nextmo_device &>(*device).set_irq_wr_callback(DEVCB_##_write);
-
-#define MCFG_NEXTMO_DRQ_CALLBACK(_write) \
-	downcast<nextmo_device &>(*device).set_drq_wr_callback(DEVCB_##_write);
 
 class nextmo_device : public device_t
 {
 public:
 	nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	template <class Object> devcb_base &set_irq_wr_callback(Object &&cb) { return irq_cb.set_callback(std::forward<Object>(cb)); }
-	template <class Object> devcb_base &set_drq_wr_callback(Object &&cb) { return drq_cb.set_callback(std::forward<Object>(cb)); }
+	auto irq_wr_callback() { return irq_cb.bind(); }
+	auto drq_wr_callback() { return drq_cb.bind(); }
 
 	void map(address_map &map);