1 files changed, 9 insertions, 15 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 41d72c3aa2b2..7cbf1d53804f 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -70,8 +70,7 @@ static DEFINE_PER_CPU(int, cpufreq_policy_cpu);
 static DEFINE_PER_CPU(struct rw_semaphore, cpu_policy_rwsem);
 
 #define lock_policy_rwsem(mode, cpu)                                    \
-static int lock_policy_rwsem_##mode                                     \
-(int cpu)                                                               \
+static int lock_policy_rwsem_##mode(int cpu)                            \
 {                                                                       \
         int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);              \
         BUG_ON(policy_cpu == -1);                                       \
@@ -81,23 +80,18 @@ static int lock_policy_rwsem_##mode					\
 }
 
 lock_policy_rwsem(read, cpu);
-
 lock_policy_rwsem(write, cpu);
 
-static void unlock_policy_rwsem_read(int cpu)
-{
-        int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);
-        BUG_ON(policy_cpu == -1);
-        up_read(&per_cpu(cpu_policy_rwsem, policy_cpu));
-}
-
-static void unlock_policy_rwsem_write(int cpu)
-{
-        int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);
-        BUG_ON(policy_cpu == -1);
-        up_write(&per_cpu(cpu_policy_rwsem, policy_cpu));
+#define unlock_policy_rwsem(mode, cpu)                                  \
+static void unlock_policy_rwsem_##mode(int cpu)                         \
+{                                                                       \
+        int policy_cpu = per_cpu(cpufreq_policy_cpu, cpu);              \
+        BUG_ON(policy_cpu == -1);                                       \
+        up_##mode(&per_cpu(cpu_policy_rwsem, policy_cpu));              \
 }
 
+unlock_policy_rwsem(read, cpu);
+unlock_policy_rwsem(write, cpu);
 
 /* internal prototypes */
 static int __cpufreq_governor(struct cpufreq_policy *policy,