Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c2f3d9 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-conversion-next3' of... 

Merge tag 'timers-conversion-next3' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core

Pull the 3rd batch of timer conversions from Kees Cook:

 - various per-architecture conversions
 - several driver conversions not picked up by a specific maintainer
 - other Acked/Reviewed conversions to go through tip
parents 6082a6e4 25b42fa8

arch/arm/mach-footbridge/dc21285.c

+8 −18
Original line number Original line Diff line number Diff line
@@ -136,19 +136,14 @@ struct pci_ops dc21285_ops = { 
static struct timer_list serr_timer;

static struct timer_list serr_timer;

static struct timer_list perr_timer;

static struct timer_list perr_timer;





static void dc21285_enable_error(unsigned long __data)

static void dc21285_enable_error(struct timer_list *timer)

{

{

	switch (__data) {

	del_timer(timer);

	case IRQ_PCI_SERR:

		del_timer(&serr_timer);

		break;





	case IRQ_PCI_PERR:

	if (timer == &serr_timer)

		del_timer(&perr_timer);

		enable_irq(IRQ_PCI_SERR)

		break;

	else if (timer == &perr_timer)

	}

		enable_irq(IRQ_PCI_PERR);



	enable_irq(__data);

}

}





/*

/*
@@ -323,13 +318,8 @@ void __init dc21285_preinit(void) 
		*CSR_PCICMD = (*CSR_PCICMD & 0xffff) | PCICMD_ERROR_BITS;

		*CSR_PCICMD = (*CSR_PCICMD & 0xffff) | PCICMD_ERROR_BITS;

	}

	}





	init_timer(&serr_timer);

	timer_setup(&serr_timer, dc21285_enable_error, 0);

	init_timer(&perr_timer);

	timer_setup(&perr_timer, dc21285_enable_error, 0);



	serr_timer.data = IRQ_PCI_SERR;

	serr_timer.function = dc21285_enable_error;

	perr_timer.data = IRQ_PCI_PERR;

	perr_timer.function = dc21285_enable_error;





	/*

	/*

	 * We don't care if these fail.

	 * We don't care if these fail.

arch/arm/mach-pxa/lubbock.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -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);

}

}

arch/arm/mach-pxa/sharpsl_pm.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -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);

arch/ia64/include/asm/sn/bte.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <asm/sn/types.h>

#include <asm/sn/types.h>

#include <asm/sn/shub_mmr.h>

#include <asm/sn/shub_mmr.h>





struct nodepda_s;



#define IBCT_NOTIFY             (0x1UL << 4)

#define IBCT_NOTIFY             (0x1UL << 4)

#define IBCT_ZFIL_MODE          (0x1UL << 0)

#define IBCT_ZFIL_MODE          (0x1UL << 0)
@@ -210,7 +212,7 @@ struct bteinfo_s { 
 */

 */

extern bte_result_t bte_copy(u64, u64, u64, u64, void *);

extern bte_result_t bte_copy(u64, u64, u64, u64, void *);

extern bte_result_t bte_unaligned_copy(u64, u64, u64, u64);

extern bte_result_t bte_unaligned_copy(u64, u64, u64, u64);

extern void bte_error_handler(unsigned long);

extern void bte_error_handler(struct nodepda_s *);





#define bte_zero(dest, len, mode, notification) \

#define bte_zero(dest, len, mode, notification) \

	bte_copy(0, dest, len, ((mode) | BTE_ZERO_FILL), notification)

	bte_copy(0, dest, len, ((mode) | BTE_ZERO_FILL), notification)

arch/ia64/kernel/mca.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1513,7 +1513,7 @@ ia64_mca_cmc_int_caller(int cmc_irq, void *arg) 
 *

 *

 */

 */

static void

static void

ia64_mca_cmc_poll (unsigned long dummy)

ia64_mca_cmc_poll (struct timer_list *unused)

{

{

	/* Trigger a CMC interrupt cascade  */

	/* Trigger a CMC interrupt cascade  */

	platform_send_ipi(cpumask_first(cpu_online_mask), IA64_CMCP_VECTOR,

	platform_send_ipi(cpumask_first(cpu_online_mask), IA64_CMCP_VECTOR,
@@ -1590,7 +1590,7 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg) 
 *

 *

 */

 */

static void

static void

ia64_mca_cpe_poll (unsigned long dummy)

ia64_mca_cpe_poll (struct timer_list *unused)

{

{

	/* Trigger a CPE interrupt cascade  */

	/* Trigger a CPE interrupt cascade  */

	platform_send_ipi(cpumask_first(cpu_online_mask), IA64_CPEP_VECTOR,

	platform_send_ipi(cpumask_first(cpu_online_mask), IA64_CPEP_VECTOR,
@@ -2098,7 +2098,7 @@ ia64_mca_late_init(void) 
		return 0;

		return 0;





	/* Setup the CMCI/P vector and handler */

	/* Setup the CMCI/P vector and handler */

	setup_timer(&cmc_poll_timer, ia64_mca_cmc_poll, 0UL);

	timer_setup(&cmc_poll_timer, ia64_mca_cmc_poll, 0);





	/* Unmask/enable the vector */

	/* Unmask/enable the vector */

	cmc_polling_enabled = 0;

	cmc_polling_enabled = 0;
@@ -2109,7 +2109,7 @@ ia64_mca_late_init(void) 
#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

	/* Setup the CPEI/P vector and handler */

	/* Setup the CPEI/P vector and handler */

	cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);

	cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);

	setup_timer(&cpe_poll_timer, ia64_mca_cpe_poll, 0UL);

	timer_setup(&cpe_poll_timer, ia64_mca_cpe_poll, 0);





	{

	{

		unsigned int irq;

		unsigned int irq;