diff options
Diffstat (limited to 'arch/arm/plat-s5p/irq-gpioint.c')
-rw-r--r-- | arch/arm/plat-s5p/irq-gpioint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-s5p/irq-gpioint.c b/arch/arm/plat-s5p/irq-gpioint.c index f71078ef6bb5..0455519aecdf 100644 --- a/arch/arm/plat-s5p/irq-gpioint.c +++ b/arch/arm/plat-s5p/irq-gpioint.c | |||
@@ -37,7 +37,7 @@ struct s5p_gpioint_bank { | |||
37 | int start; | 37 | int start; |
38 | int nr_groups; | 38 | int nr_groups; |
39 | int irq; | 39 | int irq; |
40 | struct s3c_gpio_chip **chips; | 40 | struct samsung_gpio_chip **chips; |
41 | void (*handler)(unsigned int, struct irq_desc *); | 41 | void (*handler)(unsigned int, struct irq_desc *); |
42 | }; | 42 | }; |
43 | 43 | ||
@@ -87,7 +87,7 @@ static void s5p_gpioint_handler(unsigned int irq, struct irq_desc *desc) | |||
87 | chained_irq_enter(chip, desc); | 87 | chained_irq_enter(chip, desc); |
88 | 88 | ||
89 | for (group = 0; group < bank->nr_groups; group++) { | 89 | for (group = 0; group < bank->nr_groups; group++) { |
90 | struct s3c_gpio_chip *chip = bank->chips[group]; | 90 | struct samsung_gpio_chip *chip = bank->chips[group]; |
91 | if (!chip) | 91 | if (!chip) |
92 | continue; | 92 | continue; |
93 | 93 | ||
@@ -110,7 +110,7 @@ static void s5p_gpioint_handler(unsigned int irq, struct irq_desc *desc) | |||
110 | chained_irq_exit(chip, desc); | 110 | chained_irq_exit(chip, desc); |
111 | } | 111 | } |
112 | 112 | ||
113 | static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip) | 113 | static __init int s5p_gpioint_add(struct samsung_gpio_chip *chip) |
114 | { | 114 | { |
115 | static int used_gpioint_groups = 0; | 115 | static int used_gpioint_groups = 0; |
116 | int group = chip->group; | 116 | int group = chip->group; |
@@ -130,7 +130,7 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip) | |||
130 | return -EINVAL; | 130 | return -EINVAL; |
131 | 131 | ||
132 | if (!bank->handler) { | 132 | if (!bank->handler) { |
133 | bank->chips = kzalloc(sizeof(struct s3c_gpio_chip *) * | 133 | bank->chips = kzalloc(sizeof(struct samsung_gpio_chip *) * |
134 | bank->nr_groups, GFP_KERNEL); | 134 | bank->nr_groups, GFP_KERNEL); |
135 | if (!bank->chips) | 135 | if (!bank->chips) |
136 | return -ENOMEM; | 136 | return -ENOMEM; |
@@ -173,7 +173,7 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip) | |||
173 | 173 | ||
174 | int __init s5p_register_gpio_interrupt(int pin) | 174 | int __init s5p_register_gpio_interrupt(int pin) |
175 | { | 175 | { |
176 | struct s3c_gpio_chip *my_chip = s3c_gpiolib_getchip(pin); | 176 | struct samsung_gpio_chip *my_chip = samsung_gpiolib_getchip(pin); |
177 | int offset, group; | 177 | int offset, group; |
178 | int ret; | 178 | int ret; |
179 | 179 | ||