diff --git a/src/emu/device.c b/src/emu/device.c index 5eeee60c9a3..d1f0e389cb4 100644 --- a/src/emu/device.c +++ b/src/emu/device.c @@ -124,10 +124,6 @@ device_t::~device_t() memory_region *device_t::memregion(const char *_tag) const { - // safety first - if (this == NULL) - return NULL; - // build a fully-qualified name and look it up return machine().memory().region(subtag(_tag).c_str()); } @@ -140,10 +136,6 @@ memory_region *device_t::memregion(const char *_tag) const memory_share *device_t::memshare(const char *_tag) const { - // safety first - if (this == NULL) - return NULL; - // build a fully-qualified name and look it up return machine().memory().shared(subtag(_tag).c_str()); } @@ -156,10 +148,6 @@ memory_share *device_t::memshare(const char *_tag) const memory_bank *device_t::membank(const char *_tag) const { - // safety first - if (this == NULL) - return NULL; - // build a fully-qualified name and look it up return machine().memory().bank(subtag(_tag).c_str()); } @@ -172,10 +160,6 @@ memory_bank *device_t::membank(const char *_tag) const ioport_port *device_t::ioport(const char *tag) const { - // safety first - if (this == NULL) - return NULL; - // build a fully-qualified name and look it up return machine().ioport().port(subtag(tag).c_str()); } @@ -188,10 +172,6 @@ ioport_port *device_t::ioport(const char *tag) const std::string device_t::parameter(const char *tag) const { - // safety first - if (this == NULL) - return NULL; - // build a fully-qualified name and look it up return machine().parameters().lookup(subtag(tag)); } diff --git a/src/emu/device.h b/src/emu/device.h index b6b245c8490..438e590afc6 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -584,10 +584,6 @@ private: inline device_t *device_t::subdevice(const char *tag) const { - // safety first - if (this == NULL) - return NULL; - // empty string or NULL means this device if (tag == NULL || *tag == 0) return const_cast(this); @@ -605,10 +601,6 @@ inline device_t *device_t::subdevice(const char *tag) const inline device_t *device_t::siblingdevice(const char *tag) const { - // safety first - if (this == NULL) - return NULL; - // empty string or NULL means this device if (tag == NULL || *tag == 0) return const_cast(this); diff --git a/src/emu/memory.h b/src/emu/memory.h index 7503301453e..8bb32d636d3 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -653,7 +653,7 @@ public: // getters memory_share *next() const { return m_next; } - void *ptr() const { if (this == NULL) return NULL; return m_ptr; } + void *ptr() const { return m_ptr; } size_t bytes() const { return m_bytes; } endianness_t endianness() const { return m_endianness; } UINT8 bitwidth() const { return m_bitwidth; }