Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 67d15ed7dfba8df6c723623a50a96ed1a08ba834

Authored by Lennert Buytenhek
Committed by Linus Torvalds
1 parent a1f5f22adc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

gpio: vr41xx_giu: irq_data conversion 

Converts irq_chips and flow handlers over to the new struct irq_data based
irq_chip functions.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Cc: Yoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 24 additions and 24 deletions Side-by-side Diff

drivers/gpio/vr41xx_giu.c
Diff comments   View file @ 67d15ed
... ... @@ -111,69 +111,69 @@
111 111 return data;
112 112 }
113 113  
114   -static void ack_giuint_low(unsigned int irq)
  114 +static void ack_giuint_low(struct irq_data *d)
115 115 {
116   - giu_write(GIUINTSTATL, 1 << GPIO_PIN_OF_IRQ(irq));
  116 + giu_write(GIUINTSTATL, 1 << GPIO_PIN_OF_IRQ(d->irq));
117 117 }
118 118  
119   -static void mask_giuint_low(unsigned int irq)
  119 +static void mask_giuint_low(struct irq_data *d)
120 120 {
121   - giu_clear(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
  121 + giu_clear(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(d->irq));
122 122 }
123 123  
124   -static void mask_ack_giuint_low(unsigned int irq)
  124 +static void mask_ack_giuint_low(struct irq_data *d)
125 125 {
126 126 unsigned int pin;
127 127  
128   - pin = GPIO_PIN_OF_IRQ(irq);
  128 + pin = GPIO_PIN_OF_IRQ(d->irq);
129 129 giu_clear(GIUINTENL, 1 << pin);
130 130 giu_write(GIUINTSTATL, 1 << pin);
131 131 }
132 132  
133   -static void unmask_giuint_low(unsigned int irq)
  133 +static void unmask_giuint_low(struct irq_data *d)
134 134 {
135   - giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
  135 + giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(d->irq));
136 136 }
137 137  
138 138 static struct irq_chip giuint_low_irq_chip = {
139 139 .name = "GIUINTL",
140   - .ack = ack_giuint_low,
141   - .mask = mask_giuint_low,
142   - .mask_ack = mask_ack_giuint_low,
143   - .unmask = unmask_giuint_low,
  140 + .irq_ack = ack_giuint_low,
  141 + .irq_mask = mask_giuint_low,
  142 + .irq_mask_ack = mask_ack_giuint_low,
  143 + .irq_unmask = unmask_giuint_low,
144 144 };
145 145  
146   -static void ack_giuint_high(unsigned int irq)
  146 +static void ack_giuint_high(struct irq_data *d)
147 147 {
148 148 giu_write(GIUINTSTATH,
149   - 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
  149 + 1 << (GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET));
150 150 }
151 151  
152   -static void mask_giuint_high(unsigned int irq)
  152 +static void mask_giuint_high(struct irq_data *d)
153 153 {
154   - giu_clear(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
  154 + giu_clear(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET));
155 155 }
156 156  
157   -static void mask_ack_giuint_high(unsigned int irq)
  157 +static void mask_ack_giuint_high(struct irq_data *d)
158 158 {
159 159 unsigned int pin;
160 160  
161   - pin = GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET;
  161 + pin = GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET;
162 162 giu_clear(GIUINTENH, 1 << pin);
163 163 giu_write(GIUINTSTATH, 1 << pin);
164 164 }
165 165  
166   -static void unmask_giuint_high(unsigned int irq)
  166 +static void unmask_giuint_high(struct irq_data *d)
167 167 {
168   - giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
  168 + giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET));
169 169 }
170 170  
171 171 static struct irq_chip giuint_high_irq_chip = {
172 172 .name = "GIUINTH",
173   - .ack = ack_giuint_high,
174   - .mask = mask_giuint_high,
175   - .mask_ack = mask_ack_giuint_high,
176   - .unmask = unmask_giuint_high,
  173 + .irq_ack = ack_giuint_high,
  174 + .irq_mask = mask_giuint_high,
  175 + .irq_mask_ack = mask_ack_giuint_high,
  176 + .irq_unmask = unmask_giuint_high,
177 177 };
178 178  
179 179 static int giu_get_irq(unsigned int irq)