| Message ID | 1350246738-31699-11-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 10/15/2012 04:32 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Helper function fwts_button_match_state_proc does not need > fwts_framework parameter, so remove it. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_button.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/src/lib/src/fwts_button.c b/src/lib/src/fwts_button.c > index 2b8302f..a22da82 100644 > --- a/src/lib/src/fwts_button.c > +++ b/src/lib/src/fwts_button.c > @@ -34,8 +34,7 @@ > * find matching button state and keep count of matching > * any non-matching states found, via proc iterface > */ > -static int fwts_button_match_state_proc(fwts_framework *fw, > - int button, int *matched, int *not_matched) > +static int fwts_button_match_state_proc(int button, int *matched, int *not_matched) > { > DIR *dir; > struct dirent *entry; > @@ -113,7 +112,7 @@ int fwts_button_match_state(fwts_framework *fw, int button, int *matched, int *n > *not_matched = 0; > > if (access(FWTS_PROC_ACPI_BUTTON, R_OK) == 0) > - return fwts_button_match_state_proc(fw, button, matched, not_matched); > + return fwts_button_match_state_proc(button, matched, not_matched); > > return FWTS_ERROR; > } > Acked-by: Alex Hung <alex.hung@canonical.com>
On Mon, Oct 15, 2012 at 4:32 AM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > Helper function fwts_button_match_state_proc does not need > fwts_framework parameter, so remove it. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_button.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/src/lib/src/fwts_button.c b/src/lib/src/fwts_button.c > index 2b8302f..a22da82 100644 > --- a/src/lib/src/fwts_button.c > +++ b/src/lib/src/fwts_button.c > @@ -34,8 +34,7 @@ > * find matching button state and keep count of matching > * any non-matching states found, via proc iterface > */ > -static int fwts_button_match_state_proc(fwts_framework *fw, > - int button, int *matched, int *not_matched) > +static int fwts_button_match_state_proc(int button, int *matched, int *not_matched) > { > DIR *dir; > struct dirent *entry; > @@ -113,7 +112,7 @@ int fwts_button_match_state(fwts_framework *fw, int button, int *matched, int *n > *not_matched = 0; > > if (access(FWTS_PROC_ACPI_BUTTON, R_OK) == 0) > - return fwts_button_match_state_proc(fw, button, matched, not_matched); > + return fwts_button_match_state_proc(button, matched, not_matched); > > return FWTS_ERROR; > } > -- > 1.7.10.4 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
diff --git a/src/lib/src/fwts_button.c b/src/lib/src/fwts_button.c index 2b8302f..a22da82 100644 --- a/src/lib/src/fwts_button.c +++ b/src/lib/src/fwts_button.c @@ -34,8 +34,7 @@ * find matching button state and keep count of matching * any non-matching states found, via proc iterface */ -static int fwts_button_match_state_proc(fwts_framework *fw, - int button, int *matched, int *not_matched) +static int fwts_button_match_state_proc(int button, int *matched, int *not_matched) { DIR *dir; struct dirent *entry; @@ -113,7 +112,7 @@ int fwts_button_match_state(fwts_framework *fw, int button, int *matched, int *n *not_matched = 0; if (access(FWTS_PROC_ACPI_BUTTON, R_OK) == 0) - return fwts_button_match_state_proc(fw, button, matched, not_matched); + return fwts_button_match_state_proc(button, matched, not_matched); return FWTS_ERROR; }