leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio/omap: remove get_gpio_bank()

Browse Source 
use chip info to get the pointer to the struct gpio_bank for a
given GPIO bank and remove get_gpio_bank().

Signed-off-by: Charulatha V <charu@ti.com>
This commit is contained in:
Charulatha V 2011-04-22 16:38:16 +05:30 committed by Kevin Hilman
parent 129fd22307
commit a8be8dafd0
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpio/gpio-omap.c
View File

@ -86,31 +86,6 @@ int gpio_bank_count;
#define GPIO_INDEX(bank, gpio) (gpio % bank->width) #define GPIO_INDEX(bank, gpio) (gpio % bank->width)
#define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio))
static inline struct gpio_bank *get_gpio_bank(int gpio)
{
if (cpu_is_omap15xx()) {
if (OMAP_GPIO_IS_MPUIO(gpio))
return &gpio_bank[0];
return &gpio_bank[1];
}
if (cpu_is_omap16xx()) {
if (OMAP_GPIO_IS_MPUIO(gpio))
return &gpio_bank[0];
return &gpio_bank[1 + (gpio >> 4)];
}
if (cpu_is_omap7xx()) {
if (OMAP_GPIO_IS_MPUIO(gpio))
return &gpio_bank[0];
return &gpio_bank[1 + (gpio >> 5)];
}
if (cpu_is_omap24xx())
return &gpio_bank[gpio >> 5];
if (cpu_is_omap34xx() || cpu_is_omap44xx())
return &gpio_bank[gpio >> 5];
BUG();
return NULL;
}
static inline int gpio_valid(int gpio) static inline int gpio_valid(int gpio)
{ {
if (gpio < 0) if (gpio < 0)
@ -1266,7 +1241,7 @@ static struct platform_device omap_mpuio_device = {
static inline void mpuio_init(void) static inline void mpuio_init(void)
{ {
struct gpio_bank *bank = get_gpio_bank(OMAP_MPUIO(0)); struct gpio_bank *bank = &gpio_bank[0];
platform_set_drvdata(&omap_mpuio_device, bank); platform_set_drvdata(&omap_mpuio_device, bank);
if (platform_driver_register(&omap_mpuio_driver) == 0) if (platform_driver_register(&omap_mpuio_driver) == 0)
@ -1342,7 +1317,7 @@ static int gpio_get(struct gpio_chip *chip, unsigned offset)
u32 mask; u32 mask;
gpio = chip->base + offset; gpio = chip->base + offset;
bank = get_gpio_bank(gpio); bank = container_of(chip, struct gpio_bank, chip);
reg = bank->base; reg = bank->base;
mask = GPIO_BIT(bank, gpio); mask = GPIO_BIT(bank, gpio);