[Meego-kernel] [PATCH 2/9] intel_mid_keypad: remove duplicate gpio free

Kristen Carlson Accardi kristen at linux.intel.com
Tue Feb 1 16:04:15 PST 2011


We already free the gpios in close(), we don't need to free them
again in remove().

Signed-off-by: Kristen Carlson Accardi <kristen at linux.intel.com>
---
 drivers/input/keyboard/intel_mid_keypad.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/input/keyboard/intel_mid_keypad.c b/drivers/input/keyboard/intel_mid_keypad.c
index 6095503..2679f96 100644
--- a/drivers/input/keyboard/intel_mid_keypad.c
+++ b/drivers/input/keyboard/intel_mid_keypad.c
@@ -607,14 +607,8 @@ failed_free_mem:
 static void __devexit mrst_keypad_remove(struct pci_dev *pdev)
 {
 	struct mrst_keypad *keypad = pci_get_drvdata(pdev);
-	int i;
-	int pins = KEYPAD_MATRIX_GPIO_IN_PIN + MAX_MATRIX_KEY_ROWS +
-	    MAX_MATRIX_KEY_COLS + keypad->direct_key_num;
 
 	free_irq(pdev->irq, keypad);
-	for (i = pins - 1; i > KEYPAD_MATRIX_GPIO_IN_PIN; i--)
-		gpio_free(i);
-
 	input_unregister_device(keypad->input_dev);
 	iounmap(keypad->mmio_base);
 	pci_release_regions(pdev);
-- 
1.7.3.1



More information about the MeeGo-kernel mailing list