Commit b51bf95c authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

genirq: Remove the parameter 'irq' of kstat_incr_irqs_this_cpu() 



The first parameter 'irq' is never used by
kstat_incr_irqs_this_cpu(). Remove it.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1433391238-19471-16-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 41a83e06

kernel/irq/chip.c

+8 −8
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ void handle_nested_irq(unsigned int irq) 
	raw_spin_lock_irq(&desc->lock);



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);

	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	action = desc->action;

	if (unlikely(!action || irqd_irq_disabled(&desc->irq_data))) {
@@ -391,7 +391,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc) 
		goto out_unlock;



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);

	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {

		desc->istate |= IRQS_PENDING;
@@ -443,7 +443,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc) 
		goto out_unlock;



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);

	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	/*

	 * If its disabled or no action available
@@ -515,7 +515,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) 
		goto out;



	desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);

	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	/*

	 * If its disabled or no action available
@@ -583,7 +583,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) 
		goto out_unlock;

	}



	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	/* Start handling the irq */

	desc->irq_data.chip->irq_ack(&desc->irq_data);
@@ -646,7 +646,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc) 
		goto out_eoi;

	}



	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	do {

		if (unlikely(!desc->action))
@@ -675,7 +675,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc) 
{

	struct irq_chip *chip = irq_desc_get_chip(desc);



	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	if (chip->irq_ack)

		chip->irq_ack(&desc->irq_data);
@@ -705,7 +705,7 @@ void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc) 
	void *dev_id = raw_cpu_ptr(action->percpu_dev_id);

	irqreturn_t res;



	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);



	if (chip->irq_ack)

		chip->irq_ack(&desc->irq_data);

kernel/irq/handle.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
void handle_bad_irq(unsigned int irq, struct irq_desc *desc)

{

	print_irq_desc(irq, desc);

	kstat_incr_irqs_this_cpu(irq, desc);

	kstat_incr_irqs_this_cpu(desc);

	ack_bad_irq(irq);

}

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask) 
	return __irqd_to_state(d) & mask;

}



static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *desc)

static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc)

{

	__this_cpu_inc(*desc->kstat_irqs);

	__this_cpu_inc(kstat.irqs_sum);

kernel/irq/irqdesc.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ int irq_set_percpu_devid(unsigned int irq) 


void kstat_incr_irq_this_cpu(unsigned int irq)

{

	kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));

	kstat_incr_irqs_this_cpu(irq_to_desc(irq));

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE