diff options
author | mav <mav@FreeBSD.org> | 2015-11-30 22:58:48 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-11-30 22:58:48 +0000 |
commit | 7ea9902b0d97ab7e0ac2c41e4726b1f53d28f2e4 (patch) | |
tree | fd9751345a0ecae258129b56bc15a99599260478 | |
parent | 97189158140218a2e5bfbd037679e515e9b2c64e (diff) | |
download | FreeBSD-src-7ea9902b0d97ab7e0ac2c41e4726b1f53d28f2e4.zip FreeBSD-src-7ea9902b0d97ab7e0ac2c41e4726b1f53d28f2e4.tar.gz |
MFC r289755: Remove residual verbosity.
firmware_register() already reports errors.
-rw-r--r-- | sys/dev/ispfw/ispfw.c | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c index d4fa097..5f69d7c 100644 --- a/sys/dev/ispfw/ispfw.c +++ b/sys/dev/ispfw/ispfw.c @@ -126,43 +126,27 @@ static int isp_2500_loaded; #define ISPFW_VERSION 1 -#if !defined(KLD_MODULE) -#define ISPFW_KLD 0 -#else -#define ISPFW_KLD 1 -#endif - #define RMACRO(token) do { \ if (token##_loaded) \ break; \ if (firmware_register(#token, token##_risc_code, \ token##_risc_code[3] * sizeof(token##_risc_code[3]), \ - ISPFW_VERSION, NULL) == NULL) { \ - printf("%s: unable to register firmware <%s>\n", \ - MODULE_NAME, #token); \ + ISPFW_VERSION, NULL) == NULL) \ break; \ - } \ token##_loaded++; \ - if (bootverbose || ISPFW_KLD) \ - printf("%s: registered firmware <%s>\n", MODULE_NAME, \ - #token); \ } while (0) #define UMACRO(token) do { \ if (!token##_loaded) \ break; \ if (firmware_unregister(#token) != 0) { \ - printf("%s: unable to unregister firmware <%s>\n", \ - MODULE_NAME, #token); \ + error = EBUSY; \ break; \ } \ token##_loaded--; \ - if (bootverbose || ISPFW_KLD) \ - printf("%s: unregistered firmware <%s>\n", MODULE_NAME, \ - #token); \ } while (0) -static void +static int do_load_fw(void) { @@ -196,11 +180,13 @@ do_load_fw(void) #if defined(ISP_2500) RMACRO(isp_2500); #endif + return (0); } -static void +static int do_unload_fw(void) { + int error = 0; #if defined(ISP_1000) UMACRO(isp_1000); @@ -232,6 +218,7 @@ do_unload_fw(void) #if defined(ISP_2500) UMACRO(isp_2500); #endif + return (error); } static int @@ -240,17 +227,11 @@ module_handler(module_t mod, int what, void *arg) switch (what) { case MOD_LOAD: - do_load_fw(); - break; + return (do_load_fw()); case MOD_UNLOAD: - do_unload_fw(); - break; - case MOD_SHUTDOWN: - break; - default: - return (EOPNOTSUPP); + return (do_unload_fw()); } - return (0); + return (EOPNOTSUPP); } static moduledata_t ispfw_mod = { MODULE_NAME, module_handler, NULL |