Commit 940d5b13 authored Mar 08, 2019 by Markus Armbruster

pflash: Clean up after commit 368a354f, part 1



QOMification left parameter @qdev unused in pflash_cfi01_register()
and pflash_cfi02_register().  All callers pass NULL.  Remove.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190308094610.21210-15-armbru@redhat.com>

parent 7ebfece5

hw/arm/collie.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,12 +35,12 @@ static void collie_init(MachineState *machine)
		s = sa1110_init(sysmem, collie_binfo.ram_size, machine->cpu_type);

		dinfo = drive_get(IF_PFLASH, 0, 0);
		pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
		pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,
		dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
		(64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

		dinfo = drive_get(IF_PFLASH, 0, 1);
		pflash_cfi01_register(SA_CS1, NULL, "collie.fl2", 0x02000000,
		pflash_cfi01_register(SA_CS1, "collie.fl2", 0x02000000,
		dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
		(64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

hw/arm/digic_boards.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr,
		#define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024)
		#define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024)

		pflash_cfi02_register(addr, NULL, "pflash", FLASH_K8P3215UQB_SIZE,
		pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE,
		NULL, FLASH_K8P3215UQB_SECTOR_SIZE,
		FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE,
		DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,

hw/arm/gumstix.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ static void connex_init(MachineState *machine)
		#else
		be = 0;
		#endif
		if (!pflash_cfi01_register(0x00000000, NULL, "connext.rom", connex_rom,
		if (!pflash_cfi01_register(0x00000000, "connext.rom", connex_rom,
		dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
		sector_len, connex_rom / sector_len,
		2, 0, 0, 0, 0, be)) {
		@@ -109,7 +109,7 @@ static void verdex_init(MachineState *machine)
		#else
		be = 0;
		#endif
		if (!pflash_cfi01_register(0x00000000, NULL, "verdex.rom", verdex_rom,
		if (!pflash_cfi01_register(0x00000000, "verdex.rom", verdex_rom,
		dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
		sector_len, verdex_rom / sector_len,
		2, 0, 0, 0, 0, be)) {

hw/arm/mainstone.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
		exit(1);
		}

		if (!pflash_cfi01_register(mainstone_flash_base[i], NULL,
		if (!pflash_cfi01_register(mainstone_flash_base[i],
		i ? "mainstone.flash1" : "mainstone.flash0",
		MAINSTONE_FLASH,
		blk_by_legacy_dinfo(dinfo),

hw/arm/musicpal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1635,14 +1635,14 @@ static void musicpal_init(MachineState *machine)
		* image is smaller than 32 MB.
		*/
		#ifdef TARGET_WORDS_BIGENDIAN
		pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, NULL,
		pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,
		"musicpal.flash", flash_size,
		blk, 0x10000, (flash_size + 0xffff) >> 16,
		MP_FLASH_SIZE_MAX / flash_size,
		2, 0x00BF, 0x236D, 0x0000, 0x0000,
		0x5555, 0x2AAA, 1);
		#else
		pflash_cfi02_register(0x100000000ULL-MP_FLASH_SIZE_MAX, NULL,
		pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,
		"musicpal.flash", flash_size,
		blk, 0x10000, (flash_size + 0xffff) >> 16,
		MP_FLASH_SIZE_MAX / flash_size,