diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-16 16:41:37 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-16 16:41:37 -0500 |
commit | c001dff0f6715813bdb8e978dc8c05416c01962b (patch) | |
tree | 36a38b379b5b2d9ee9ca092768c15c089437a414 | |
parent | e0f5bb9b3850bdd7907eda9eb923cd3f9d4358b8 (diff) |
staging: android: switch: minor code formatting cleanups
This fixes a number of minor space issues in the Android switch code.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/android/switch/switch.h | 2 | ||||
-rw-r--r-- | drivers/staging/android/switch/switch_gpio.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/android/switch/switch.h b/drivers/staging/android/switch/switch.h index 3e4c748e343a..4fcb3109875a 100644 --- a/drivers/staging/android/switch/switch.h +++ b/drivers/staging/android/switch/switch.h | |||
@@ -30,7 +30,7 @@ struct switch_dev { | |||
30 | 30 | ||
31 | struct gpio_switch_platform_data { | 31 | struct gpio_switch_platform_data { |
32 | const char *name; | 32 | const char *name; |
33 | unsigned gpio; | 33 | unsigned gpio; |
34 | 34 | ||
35 | /* if NULL, switch_dev.name will be printed */ | 35 | /* if NULL, switch_dev.name will be printed */ |
36 | const char *name_on; | 36 | const char *name_on; |
diff --git a/drivers/staging/android/switch/switch_gpio.c b/drivers/staging/android/switch/switch_gpio.c index 6ba8d97e6bd1..38b2c2f6004e 100644 --- a/drivers/staging/android/switch/switch_gpio.c +++ b/drivers/staging/android/switch/switch_gpio.c | |||
@@ -91,7 +91,7 @@ static int gpio_switch_probe(struct platform_device *pdev) | |||
91 | switch_data->state_off = pdata->state_off; | 91 | switch_data->state_off = pdata->state_off; |
92 | switch_data->sdev.print_state = switch_gpio_print_state; | 92 | switch_data->sdev.print_state = switch_gpio_print_state; |
93 | 93 | ||
94 | ret = switch_dev_register(&switch_data->sdev); | 94 | ret = switch_dev_register(&switch_data->sdev); |
95 | if (ret < 0) | 95 | if (ret < 0) |
96 | goto err_switch_dev_register; | 96 | goto err_switch_dev_register; |
97 | 97 | ||
@@ -126,7 +126,7 @@ err_detect_irq_num_failed: | |||
126 | err_set_gpio_input: | 126 | err_set_gpio_input: |
127 | gpio_free(switch_data->gpio); | 127 | gpio_free(switch_data->gpio); |
128 | err_request_gpio: | 128 | err_request_gpio: |
129 | switch_dev_unregister(&switch_data->sdev); | 129 | switch_dev_unregister(&switch_data->sdev); |
130 | err_switch_dev_register: | 130 | err_switch_dev_register: |
131 | kfree(switch_data); | 131 | kfree(switch_data); |
132 | 132 | ||
@@ -139,7 +139,7 @@ static int __devexit gpio_switch_remove(struct platform_device *pdev) | |||
139 | 139 | ||
140 | cancel_work_sync(&switch_data->work); | 140 | cancel_work_sync(&switch_data->work); |
141 | gpio_free(switch_data->gpio); | 141 | gpio_free(switch_data->gpio); |
142 | switch_dev_unregister(&switch_data->sdev); | 142 | switch_dev_unregister(&switch_data->sdev); |
143 | kfree(switch_data); | 143 | kfree(switch_data); |
144 | 144 | ||
145 | return 0; | 145 | return 0; |