diff options
| -rw-r--r-- | linux_mtd.c | 10 | ||||
| -rw-r--r-- | nicintel_eeprom.c | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/linux_mtd.c b/linux_mtd.c index 42d569d16..04eccde27 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -314,6 +314,7 @@ static const struct opaque_master linux_mtd_opaque_master = { .read = linux_mtd_read, .write = linux_mtd_write, .erase = linux_mtd_erase, + .shutdown = linux_mtd_shutdown, }; /* Returns 0 if setup is successful, non-zero to indicate error */ @@ -418,14 +419,7 @@ static int linux_mtd_init(void) return 1; } - if (register_shutdown(linux_mtd_shutdown, (void *)data)) { - free(data); - return 1; - } - - register_opaque_master(&linux_mtd_opaque_master, data); - - return 0; + return register_opaque_master(&linux_mtd_opaque_master, data); linux_mtd_init_exit: free(param); diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index fd9025058..58870732c 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -446,6 +446,7 @@ static const struct opaque_master opaque_master_nicintel_ee_82580 = { .read = nicintel_ee_read, .write = nicintel_ee_write_82580, .erase = nicintel_ee_erase_82580, + .shutdown = nicintel_ee_shutdown_82580, }; static const struct opaque_master opaque_master_nicintel_ee_i210 = { @@ -453,6 +454,7 @@ static const struct opaque_master opaque_master_nicintel_ee_i210 = { .read = nicintel_ee_read, .write = nicintel_ee_write_i210, .erase = nicintel_ee_erase_i210, + .shutdown = nicintel_ee_shutdown_i210, }; static int nicintel_ee_init(void) @@ -493,19 +495,13 @@ static int nicintel_ee_init(void) *eecp = eec; } - if (register_shutdown(nicintel_ee_shutdown_82580, eecp)) - return 1; - - return register_opaque_master(&opaque_master_nicintel_ee_82580, NULL); + return register_opaque_master(&opaque_master_nicintel_ee_82580, eecp); } else { nicintel_eebar = rphysmap("Intel i210 NIC w/ emulated EEPROM", io_base_addr + 0x12000, MEMMAP_SIZE); if (!nicintel_eebar) return 1; - if (register_shutdown(nicintel_ee_shutdown_i210, NULL)) - return 1; - return register_opaque_master(&opaque_master_nicintel_ee_i210, NULL); } |