mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

arm: pxa: Convert timers to use timer_setup()

Browse source 
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Adds a static variable to hold the
interrupt private data pointer.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Kees Cook 2017-10-10 17:13:01 -07:00
parent b7bea32f0c
commit 96d130824f
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/mach-pxa/lubbock.c
View file

@ -381,14 +381,11 @@ static struct pxafb_mach_info sharp_lm8v31 = {
#define MMC_POLL_RATE msecs_to_jiffies(1000) #define MMC_POLL_RATE msecs_to_jiffies(1000)
static void lubbock_mmc_poll(unsigned long);
static irq_handler_t mmc_detect_int; static irq_handler_t mmc_detect_int;
static void *mmc_detect_int_data;
static struct timer_list mmc_timer;
static struct timer_list mmc_timer = { static void lubbock_mmc_poll(struct timer_list *unused)
.function = lubbock_mmc_poll,
};
static void lubbock_mmc_poll(unsigned long data)
{ {
unsigned long flags; unsigned long flags;
@ -401,7 +398,7 @@ static void lubbock_mmc_poll(unsigned long data)
if (LUB_IRQ_SET_CLR & (1 << 0)) if (LUB_IRQ_SET_CLR & (1 << 0))
mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE); mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE);
else { else {
(void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data); (void) mmc_detect_int(LUBBOCK_SD_IRQ, mmc_detect_int_data);
enable_irq(LUBBOCK_SD_IRQ); enable_irq(LUBBOCK_SD_IRQ);
} }
} }
@ -421,8 +418,8 @@ static int lubbock_mci_init(struct device *dev,
{ {
/* detect card insert/eject */ /* detect card insert/eject */
mmc_detect_int = detect_int; mmc_detect_int = detect_int;
init_timer(&mmc_timer); mmc_detect_int_data = data;
mmc_timer.data = (unsigned long) data; timer_setup(&mmc_timer, lubbock_mmc_poll, 0);
return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int, return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,
0, "lubbock-sd-detect", data); 0, "lubbock-sd-detect", data);
} }

8
arch/arm/mach-pxa/sharpsl_pm.c
View file

@ -341,7 +341,7 @@ static void sharpsl_charge_toggle(struct work_struct *private_)
sharpsl_pm.charge_start_time = jiffies; sharpsl_pm.charge_start_time = jiffies;
} }
static void sharpsl_ac_timer(unsigned long data) static void sharpsl_ac_timer(struct timer_list *unused)
{ {
int acin = sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN); int acin = sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN);
@ -366,7 +366,7 @@ static irqreturn_t sharpsl_ac_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void sharpsl_chrg_full_timer(unsigned long data) static void sharpsl_chrg_full_timer(struct timer_list *unused)
{ {
dev_dbg(sharpsl_pm.dev, "Charge Full at time: %lx\n", jiffies); dev_dbg(sharpsl_pm.dev, "Charge Full at time: %lx\n", jiffies);
@ -841,9 +841,9 @@ static int sharpsl_pm_probe(struct platform_device *pdev)
sharpsl_pm.charge_mode = CHRG_OFF; sharpsl_pm.charge_mode = CHRG_OFF;
sharpsl_pm.flags = 0; sharpsl_pm.flags = 0;
setup_timer(&sharpsl_pm.ac_timer, sharpsl_ac_timer, 0UL); timer_setup(&sharpsl_pm.ac_timer, sharpsl_ac_timer, 0);
setup_timer(&sharpsl_pm.chrg_full_timer, sharpsl_chrg_full_timer, 0UL); timer_setup(&sharpsl_pm.chrg_full_timer, sharpsl_chrg_full_timer, 0);
led_trigger_register_simple("sharpsl-charge", &sharpsl_charge_led_trigger); led_trigger_register_simple("sharpsl-charge", &sharpsl_charge_led_trigger);