From 81c7db723ebd0c677784a728020c7e8845868daf Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 8 Mar 2019 10:46:00 +0100 Subject: hw: Use PFLASH_CFI0{1,2} and TYPE_PFLASH_CFI0{1,2} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have two open-coded copies of macro PFLASH_CFI01(). Move the macro to the header, so we can ditch the copies. Move PFLASH_CFI02() to the header for symmetry. We define macros TYPE_PFLASH_CFI01 and TYPE_PFLASH_CFI02 for type name strings, then mostly use the strings. If the macros are worth defining, they are worth using. Replace the strings by the macros. Signed-off-by: Markus Armbruster Reviewed-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20190308094610.21210-6-armbru@redhat.com> --- hw/block/pflash_cfi02.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'hw/block/pflash_cfi02.c') diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 933de99d6a..915c6171a0 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -57,9 +57,6 @@ do { \ #define PFLASH_LAZY_ROMD_THRESHOLD 42 -#define PFLASH_CFI02(obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02) - struct PFlashCFI02 { /*< private >*/ SysBusDevice parent_obj; -- cgit v1.2.3