diff mbox series

[26/35] ARM: davinci: cp-intc: improve coding style

Message ID 20190131133928.17985-27-brgl@bgdev.pl (mailing list archive)
State New, archived
Headers show
Series ARM: davinci: modernize the irq support | expand

Commit Message

Bartosz Golaszewski Jan. 31, 2019, 1:39 p.m. UTC 
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Drop tabs from variable initialization. Arrange variables in reverse
christmas-tree order. Add a newline before a return.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 arch/arm/mach-davinci/cp_intc.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

David Lechner Feb. 5, 2019, 12:35 a.m. UTC | #1 
On 1/31/19 7:39 AM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> 
> Drop tabs from variable initialization. Arrange variables in reverse
> christmas-tree order.

I'm not sure this description is correct.


> Add a newline before a return.
> 
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> ---
>   arch/arm/mach-davinci/cp_intc.c | 13 +++++++------
>   1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
> index 2ce0b7653c88..4cd515b507f4 100644
> --- a/arch/arm/mach-davinci/cp_intc.c
> +++ b/arch/arm/mach-davinci/cp_intc.c
> @@ -76,12 +76,12 @@ static void cp_intc_unmask_irq(struct irq_data *d)
>   static int davinci_cp_intc_set_irq_type(struct irq_data *d,
>   					unsigned int flow_type)
>   {
> -	unsigned reg		= BIT_WORD(d->hwirq);
> -	unsigned mask		= BIT_MASK(d->hwirq);
> -	unsigned polarity	= davinci_cp_intc_read(
> -					DAVINCI_CP_INTC_SYS_POLARITY(reg));
> -	unsigned type		= davinci_cp_intc_read(
> -					DAVINCI_CP_INTC_SYS_TYPE(reg));
> +	unsigned int reg, mask, polarity, type;
> +
> +	reg = BIT_WORD(d->hwirq);
> +	mask = BIT_MASK(d->hwirq);
> +	polarity = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_POLARITY(reg));
> +	type = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_TYPE(reg));
>   
>   	switch (flow_type) {
>   	case IRQ_TYPE_EDGE_RISING:
> @@ -137,6 +137,7 @@ static int davinci_cp_intc_host_map(struct irq_domain *h, unsigned int virq,
>   	irq_set_chip(virq, &davinci_cp_intc_irq_chip);
>   	irq_set_probe(virq);
>   	irq_set_handler(virq, handle_edge_irq);
> +
>   	return 0;
>   }
>   
>
diff mbox series

Patch

diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index 2ce0b7653c88..4cd515b507f4 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -76,12 +76,12 @@  static void cp_intc_unmask_irq(struct irq_data *d)
 static int davinci_cp_intc_set_irq_type(struct irq_data *d,
 					unsigned int flow_type)
 {
-	unsigned reg		= BIT_WORD(d->hwirq);
-	unsigned mask		= BIT_MASK(d->hwirq);
-	unsigned polarity	= davinci_cp_intc_read(
-					DAVINCI_CP_INTC_SYS_POLARITY(reg));
-	unsigned type		= davinci_cp_intc_read(
-					DAVINCI_CP_INTC_SYS_TYPE(reg));
+	unsigned int reg, mask, polarity, type;
+
+	reg = BIT_WORD(d->hwirq);
+	mask = BIT_MASK(d->hwirq);
+	polarity = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_POLARITY(reg));
+	type = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_TYPE(reg));
 
 	switch (flow_type) {
 	case IRQ_TYPE_EDGE_RISING:
@@ -137,6 +137,7 @@  static int davinci_cp_intc_host_map(struct irq_domain *h, unsigned int virq,
 	irq_set_chip(virq, &davinci_cp_intc_irq_chip);
 	irq_set_probe(virq);
 	irq_set_handler(virq, handle_edge_irq);
+
 	return 0;
 }