summaryrefslogtreecommitdiffstats
path: root/op-flasher
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-11-03 12:23:11 +1030
committerJoel Stanley <joel@jms.id.au>2016-11-04 11:08:15 +1030
commit7ba4172dadeb928d30f4242199b80791883020d7 (patch)
tree8985fecc580b81a3b83513acd758cc751dbe82d6 /op-flasher
parent6677705616fbfbbb58da18384f48db498494b64f (diff)
downloadtalos-skeleton-7ba4172dadeb928d30f4242199b80791883020d7.tar.gz
talos-skeleton-7ba4172dadeb928d30f4242199b80791883020d7.zip
flasher: unify cleanup commands
Now that we don't do locking there is no difference between the bmc and pnor cleanups. Change-Id: I5fe9d33ce799a84123f9e146e6856dbaa6684b1f Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'op-flasher')
-rw-r--r--op-flasher/flasher_obj.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/op-flasher/flasher_obj.c b/op-flasher/flasher_obj.c
index 25182b1..984565c 100644
--- a/op-flasher/flasher_obj.c
+++ b/op-flasher/flasher_obj.c
@@ -158,7 +158,7 @@ program_file(FlashControl* flash_control, const char *file, uint32_t start, uint
}
static void
-flash_access_cleanup_bmc(void)
+flash_access_cleanup(void)
{
if(ffsh)
ffs_close(ffsh);
@@ -177,16 +177,10 @@ flash_access_setup_bmc(void)
}
/* Setup cleanup function */
- atexit(flash_access_cleanup_bmc);
+ atexit(flash_access_cleanup);
return FLASH_OK;
}
-static void
-flash_access_cleanup_pnor(void)
-{
- flash_access_cleanup_bmc();
-}
-
static int
flash_access_setup_pnor(void)
{
@@ -203,7 +197,7 @@ flash_access_setup_pnor(void)
}
/* Setup cleanup function */
- atexit(flash_access_cleanup_pnor);
+ atexit(flash_access_cleanup);
return FLASH_OK;
}
OpenPOWER on IntegriCloud