[PATCH 22/26] hotkey: remove redundant framework parameter from hotkey_find_keymap

Keng-Yu Lin kengyu at canonical.com
Wed Oct 17 07:56:24 UTC 2012


On Mon, Oct 15, 2012 at 4:32 AM, Colin King <colin.king at canonical.com> wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> We don't need to pass the fwts_framework pointer to hotkey_find_keymap
> so remove it.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>  src/hotkey/hotkey/hotkey.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/hotkey/hotkey/hotkey.c b/src/hotkey/hotkey/hotkey.c
> index dfd8888..7602e89 100644
> --- a/src/hotkey/hotkey/hotkey.c
> +++ b/src/hotkey/hotkey/hotkey.c
> @@ -175,7 +175,7 @@ static char *hotkey_find_keyboard(fwts_framework *fw, char *path)
>         return dev;
>  }
>
> -static char *hotkey_find_keymap(fwts_framework *fw, char *device)
> +static char *hotkey_find_keymap(char *device)
>  {
>         fwts_list *output;
>         fwts_list_link *item;
> @@ -210,7 +210,7 @@ static int hotkey_init(fwts_framework *fw)
>                 fwts_log_error(fw, "Cannot find keyboard for this machine.");
>                 return FWTS_ERROR;
>         }
> -       if ((hotkey_keymap = hotkey_find_keymap(fw, hotkey_dev)) == NULL) {
> +       if ((hotkey_keymap = hotkey_find_keymap(hotkey_dev)) == NULL) {
>                 fwts_log_error(fw, "Cannot determine keymap for this machine.");
>                 return FWTS_ERROR;
>         }
> --
> 1.7.10.4
>
Acked-by: Keng-Yu Lin <kengyu at canonical.com>



More information about the fwts-devel mailing list