From 3782b3785334c5a0d50a96b1a54b1e64bef507a5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Aug 2015 11:11:10 +1000 Subject: [PATCH] Drop the 'device' argument from libratbag_device_set_active_profile The profile is bound to a device anyway. Signed-off-by: Peter Hutterer --- src/libratbag.c | 4 ++-- src/libratbag.h | 4 +--- tools/ratbag-command.c | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libratbag.c b/src/libratbag.c index 6266ca8c..e857b272 100644 --- a/src/libratbag.c +++ b/src/libratbag.c @@ -585,9 +585,9 @@ ratbag_device_has_capability(const struct ratbag_device *device, } LIBRATBAG_EXPORT int -ratbag_device_set_active_profile(struct ratbag_device *device, - struct ratbag_profile *profile) +ratbag_device_set_active_profile(struct ratbag_profile *profile) { + struct ratbag_device *device = profile->device; int rc; assert(device->driver->write_profile); diff --git a/src/libratbag.h b/src/libratbag.h index 22b4726b..17d954c2 100644 --- a/src/libratbag.h +++ b/src/libratbag.h @@ -344,14 +344,12 @@ ratbag_device_get_active_profile(struct ratbag_device *ratbag); * * This function sets the currently active profile to the one provided. * - * @param ratbag A previously initialized ratbag context * @param profile The profile to make the active profile. * * @return 0 on success or nonzero otherwise. */ int -ratbag_device_set_active_profile(struct ratbag_device *ratbag, - struct ratbag_profile *profile); +ratbag_device_set_active_profile(struct ratbag_profile *profile); /** * @ingroup device diff --git a/tools/ratbag-command.c b/tools/ratbag-command.c index 8b8e3d99..a681865e 100644 --- a/tools/ratbag-command.c +++ b/tools/ratbag-command.c @@ -339,7 +339,7 @@ ratbag_cmd_switch_profile(struct ratbag *ratbag, uint32_t flags, int argc, char } if (active_profile != profile) { - rc = ratbag_device_set_active_profile(device, profile); + rc = ratbag_device_set_active_profile(profile); if (!rc) printf("Switched '%s' to profile '%d'\n", ratbag_device_get_name(device), index); @@ -418,7 +418,7 @@ ratbag_cmd_switch_etekcity(struct ratbag *ratbag, uint32_t flags, int argc, char if (!commit) goto out; - rc = ratbag_device_set_active_profile(device, profile); + rc = ratbag_device_set_active_profile(profile); if (!rc) printf("Switched the current profile of '%s' to %sreport the volume keys\n", ratbag_device_get_name(device), @@ -489,7 +489,7 @@ ratbag_cmd_change_button(struct ratbag *ratbag, uint32_t flags, int argc, char * goto out; } - rc = ratbag_device_set_active_profile(device, profile); + rc = ratbag_device_set_active_profile(profile); if (rc) { error("Unable to apply the current profile: %s (%d)\n", strerror(-rc),