lkml.org 
[lkml]   [2019]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch 05/29] x86/hpet: Remove unused parameter from hpet_next_event()
The clockevent device pointer is not used in this function.

While at it, rename the misnamed 'timer' parameter to 'channel', which makes it
clear what this parameter means.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/kernel/hpet.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -347,15 +347,14 @@ static int hpet_resume(struct clock_even
return 0;
}

-static int hpet_next_event(unsigned long delta,
- struct clock_event_device *evt, int timer)
+static int hpet_next_event(unsigned long delta, int channel)
{
u32 cnt;
s32 res;

cnt = hpet_readl(HPET_COUNTER);
cnt += (u32) delta;
- hpet_writel(cnt, HPET_Tn_CMP(timer));
+ hpet_writel(cnt, HPET_Tn_CMP(channel));

/*
* HPETs are a complete disaster. The compare register is
@@ -407,7 +406,7 @@ static int hpet_legacy_resume(struct clo
static int hpet_legacy_next_event(unsigned long delta,
struct clock_event_device *evt)
{
- return hpet_next_event(delta, evt, 0);
+ return hpet_next_event(delta, 0);
}

/*
@@ -508,7 +507,8 @@ static int hpet_msi_next_event(unsigned
struct clock_event_device *evt)
{
struct hpet_dev *hdev = EVT_TO_HPET_DEV(evt);
- return hpet_next_event(delta, evt, hdev->num);
+
+ return hpet_next_event(delta, hdev->num);
}

static irqreturn_t hpet_interrupt_handler(int irq, void *data)

\
 
 \ /
  Last update: 2019-06-23 15:29    [W:0.245 / U:6.468 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site