Commit 75916d55 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

ARM: 7903/1: sa1100: h3xxx: drop hand-coded gpio_request_array analogue 



h3xxx_init_gpio() behaves alsmost like gpio_request_array. Also after
all GPIO refactoring it is unused. Drop it now.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eb02313d

arch/arm/mach-sa1100/h3xxx.c

+0 −31
Original line number Diff line number Diff line
@@ -28,37 +28,6 @@ 


#include "generic.h"



void h3xxx_init_gpio(struct gpio_default_state *s, size_t n)

{

	while (n--) {

		const char *name = s->name;

		int err;



		if (!name)

			name = "[init]";

		err = gpio_request(s->gpio, name);

		if (err) {

			printk(KERN_ERR "gpio%u: unable to request: %d\n",

				s->gpio, err);

			continue;

		}

		if (s->mode >= 0) {

			err = gpio_direction_output(s->gpio, s->mode);

		} else {

			err = gpio_direction_input(s->gpio);

		}

		if (err) {

			printk(KERN_ERR "gpio%u: unable to set direction: %d\n",

				s->gpio, err);

			continue;

		}

		if (!s->name)

			gpio_free(s->gpio);

		s++;

	}

}





/*

 * H3xxx flash support

 */

arch/arm/mach-sa1100/include/mach/h3xxx.h

+0 −11
Original line number Diff line number Diff line
@@ -79,17 +79,6 @@ 
#define H3600_EGPIO_LCD_5V_ON		(H3XXX_EGPIO_BASE + 14) /* enable 5V to LCD. active high. */

#define H3600_EGPIO_LVDD_ON		(H3XXX_EGPIO_BASE + 15) /* enable 9V and -6.5V to LCD. */



struct gpio_default_state {

	int gpio;

	int mode;

	const char *name;

};



#define GPIO_MODE_IN	-1

#define GPIO_MODE_OUT0	0

#define GPIO_MODE_OUT1	1



void h3xxx_init_gpio(struct gpio_default_state *s, size_t n);

void __init h3xxx_map_io(void);

void __init h3xxx_mach_init(void);