From 9a2f91d7eb07bfe1cc1fa52359e56f5498d89f84 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Thu, 13 May 2021 12:56:51 +1000 Subject: programmer: Make use of new register_opaque_master() API Pass pointers to dynamically allocated data to register_opaque_master(). This way we can avoid a mutable global. BUG=b:185191942 TEST=builds Change-Id: I160810cd67f782131962e96fc6d20e2987fb0390 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/54171 Reviewed-by: Edward O'Callaghan Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- linux_mtd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux_mtd.c') diff --git a/linux_mtd.c b/linux_mtd.c index aeaecce2..a1af0696 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -295,7 +295,7 @@ static int linux_mtd_erase(struct flashctx *flash, return 0; } -static struct opaque_master programmer_linux_mtd = { +static const struct opaque_master programmer_linux_mtd = { /* max_data_{read,write} don't have any effect for this programmer */ .max_data_read = MAX_DATA_UNSPECIFIED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -418,13 +418,12 @@ int linux_mtd_init(void) goto linux_mtd_init_exit; } - programmer_linux_mtd.data = data; if (register_shutdown(linux_mtd_shutdown, (void *)data)) { free(data); goto linux_mtd_init_exit; } - register_opaque_master(&programmer_linux_mtd, NULL); + register_opaque_master(&programmer_linux_mtd, data); ret = 0; linux_mtd_init_exit: -- cgit v1.2.3