[PATCH 1/2] fbdev/uvesafb: Remove uvesafb_exec() prototype from include/video/uvesafb.h

[PATCH 1/2] fbdev/uvesafb: Remove uvesafb_exec() prototype from include/video/uvesafb.h

[Jorge Maidana]

uvesafb_exec() is a static function defined and called only in
drivers/video/fbdev/uvesafb.c, remove the prototype from
include/video/uvesafb.h.

Fixes the warning:
./include/video/uvesafb.h:112:12: warning: 'uvesafb_exec' declared 'static' but never defined [-Wunused-function]
when including '<video/uvesafb.h>' in an external program.

Signed-off-by: Jorge Maidana <jorgem.linux@gmail.com>
---
 include/video/uvesafb.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
index 8d2a3bfc8..47d96e75e 100644
--- a/include/video/uvesafb.h
+++ b/include/video/uvesafb.h
@@ -109,8 +109,6 @@ struct uvesafb_ktask {
 	u32 ack;
 };
 
-static int uvesafb_exec(struct uvesafb_ktask *tsk);
-
 #define UVESAFB_EXACT_RES	1
 #define UVESAFB_EXACT_DEPTH	2
 
-- 
2.30.2

[PATCH 2/2] fbdev/uvesafb: Call cn_del_callback() at the end of uvesafb_exit()

[Jorge Maidana]

Delete the v86d netlink only after all the VBE tasks have been
completed.

Fixes initial state restore on module unload:
uvesafb: VBE state restore call failed (eax=0x4f04, err=-19)

Signed-off-by: Jorge Maidana <jorgem.linux@gmail.com>
---
 drivers/video/fbdev/uvesafb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index a1a67830f..e1f421e91 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -1928,10 +1928,10 @@ static void uvesafb_exit(void)
 		}
 	}
 
-	cn_del_callback(&uvesafb_cn_id);
 	driver_remove_file(&uvesafb_driver.driver, &driver_attr_v86d);
 	platform_device_unregister(uvesafb_device);
 	platform_driver_unregister(&uvesafb_driver);
+	cn_del_callback(&uvesafb_cn_id);
 }
 
 module_exit(uvesafb_exit);
-- 
2.30.2

Re: [PATCH 1/2] fbdev/uvesafb: Remove uvesafb_exec() prototype from include/video/uvesafb.h

[Helge Deller]

On 10/6/23 22:43, Jorge Maidana wrote:
> uvesafb_exec() is a static function defined and called only in
> drivers/video/fbdev/uvesafb.c, remove the prototype from
> include/video/uvesafb.h.
>
> Fixes the warning:
> ./include/video/uvesafb.h:112:12: warning: 'uvesafb_exec' declared 'static' but never defined [-Wunused-function]
> when including '<video/uvesafb.h>' in an external program.
>
> Signed-off-by: Jorge Maidana <jorgem.linux@gmail.com>

applied both patches.

Thanks!
Helge


> ---
>   include/video/uvesafb.h | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
> index 8d2a3bfc8..47d96e75e 100644
> --- a/include/video/uvesafb.h
> +++ b/include/video/uvesafb.h
> @@ -109,8 +109,6 @@ struct uvesafb_ktask {
>   	u32 ack;
>   };
>
> -static int uvesafb_exec(struct uvesafb_ktask *tsk);
> -
>   #define UVESAFB_EXACT_RES	1
>   #define UVESAFB_EXACT_DEPTH	2
>