Blackfin: remove useless duplicated assignment in gpio code

[safe/jmp/linux-2.6] / arch / blackfin / kernel / bfin_gpio.c

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index beffa00..fc4681c 100644 (file)
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -686,14 +686,12 @@ void bfin_gpio_pm_hibernate_restore(void)
                *port_fer[bank] = gpio_bank_saved[bank].fer;
 #endif
                gpio_array[bank]->inen  = gpio_bank_saved[bank].inen;
+               gpio_array[bank]->data_set = gpio_bank_saved[bank].data
+                                               & gpio_bank_saved[bank].dir;
                gpio_array[bank]->dir   = gpio_bank_saved[bank].dir;
                gpio_array[bank]->polar = gpio_bank_saved[bank].polar;
                gpio_array[bank]->edge  = gpio_bank_saved[bank].edge;
                gpio_array[bank]->both  = gpio_bank_saved[bank].both;
-
-               gpio_array[bank]->data_set = gpio_bank_saved[bank].data
-                                               | gpio_bank_saved[bank].dir;
-
                gpio_array[bank]->maska = gpio_bank_saved[bank].maska;
        }
        AWA_DUMMY_READ(maska);
@@ -724,7 +722,6 @@ void bfin_gpio_pm_hibernate_suspend(void)
                gpio_bank_saved[bank].fer = gpio_array[bank]->port_fer;
                gpio_bank_saved[bank].mux = gpio_array[bank]->port_mux;
                gpio_bank_saved[bank].data = gpio_array[bank]->data;
-               gpio_bank_saved[bank].data = gpio_array[bank]->data;
                gpio_bank_saved[bank].inen = gpio_array[bank]->inen;
                gpio_bank_saved[bank].dir = gpio_array[bank]->dir_set;
        }