From patchwork Fri Aug 1 10:20:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 375690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id D9BD714011D; Fri, 1 Aug 2014 20:21:01 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XD9xM-00082K-QR; Fri, 01 Aug 2014 10:21:00 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XD9xC-000815-4J for fwts-devel@lists.ubuntu.com; Fri, 01 Aug 2014 10:20:50 +0000 Received: from host175-199-dynamic.2-87-r.retail.telecomitalia.it ([87.2.199.175] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XD9xB-0004tj-Oy for fwts-devel@lists.ubuntu.com; Fri, 01 Aug 2014 10:20:50 +0000 From: Alberto Milone To: fwts-devel@lists.ubuntu.com Subject: [PATCH 5/7] fwts_pm_method.h: move _cleanup_free_ here and share it with s3 and s4 Date: Fri, 1 Aug 2014 12:20:38 +0200 Message-Id: <1406888440-5692-6-git-send-email-alberto.milone@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406888440-5692-1-git-send-email-alberto.milone@canonical.com> References: <1406888440-5692-1-git-send-email-alberto.milone@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com Signed-off-by: Alberto Milone Acked-by: Alex Hung Acked-by: Keng-Yu Lin --- src/acpi/s3/s3.c | 9 --------- src/acpi/s4/s4.c | 9 --------- src/lib/include/fwts_pm_method.h | 7 +++++++ 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c index 4bd7651..70ebaae 100644 --- a/src/acpi/s3/s3.c +++ b/src/acpi/s3/s3.c @@ -29,10 +29,6 @@ #include #include -static inline void freep(void *); - -#define _cleanup_free_ __attribute__((cleanup(freep))) - #define PM_SUSPEND_PMUTILS "pm-suspend" #define PM_SUSPEND_HYBRID_PMUTILS "pm-suspend-hybrid" @@ -49,11 +45,6 @@ static float s3_suspend_time = 15.0; /* Maximum allowed suspend time */ static float s3_resume_time = 15.0; /* Maximum allowed resume time */ static bool s3_hybrid = false; -static inline void freep(void *p) -{ - free(*(void**) p); -} - static int s3_init(fwts_framework *fw) { /* Pre-init - make sure wakealarm works so that we can wake up after suspend */ diff --git a/src/acpi/s4/s4.c b/src/acpi/s4/s4.c index 2ce8b3d..8400538 100644 --- a/src/acpi/s4/s4.c +++ b/src/acpi/s4/s4.c @@ -27,10 +27,6 @@ #include #include -static inline void freep(void *); - -#define _cleanup_free_ __attribute__((cleanup(freep))) - #define PM_HIBERNATE "pm-hibernate" #define FWTS_TRACING_BUFFER_SIZE "/sys/kernel/debug/tracing/buffer_size_kb" @@ -45,11 +41,6 @@ static char *s4_quirks = NULL; /* Quirks to be passed to pm-hibernate */ static int s4_device_check_delay = 15; /* Time to sleep after waking up and then running device check */ static bool s4_min_max_delay = false; -static inline void freep(void *p) -{ - free(*(void**) p); -} - static int s4_init(fwts_framework *fw) { fwts_list* swap_devs; diff --git a/src/lib/include/fwts_pm_method.h b/src/lib/include/fwts_pm_method.h index f2dade5..75c9c84 100644 --- a/src/lib/include/fwts_pm_method.h +++ b/src/lib/include/fwts_pm_method.h @@ -40,8 +40,10 @@ typedef struct } fwts_pm_method_vars; static inline void free_pm_method_vars(void *); +static inline void freep(void *); #define _cleanup_free_pm_vars_ __attribute__((cleanup(free_pm_method_vars))) +#define _cleanup_free_ __attribute__((cleanup(freep))) #define PM_SUSPEND_LOGIND "Suspend" #define PM_SUSPEND_HYBRID_LOGIND "HybridSleep" @@ -78,6 +80,11 @@ static inline void free_pm_method_vars(void *vars) var = NULL; } +static inline void freep(void *p) +{ + free(*(void**) p); +} + int fwts_logind_init_proxy(fwts_pm_method_vars *fwts_settings); int fwts_logind_wait_for_resume_from_action(fwts_pm_method_vars *fwts_settings, const char *action, int minimum_delay); bool fwts_logind_can_suspend(fwts_pm_method_vars *fwts_settings);