tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Staging: android: timed_gpio: Rename android_timed_gpio to timed_gpio

Signed-off-by: Mike Lockwood <lockwood@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


authored by

Mike Lockwood and committed by
Greg Kroah-Hartman 653d1290 99f41131

+18 -18
+3 -3
drivers/staging/android/android_timed_gpio.h drivers/staging/android/timed_gpio.h
··· 1 - /* include/linux/android_timed_gpio.h 1 + /* include/linux/timed_gpio.h 2 2 * 3 3 * Copyright (C) 2008 Google, Inc. 4 4 * ··· 13 13 * 14 14 */ 15 15 16 - #ifndef _LINUX_ANDROID_TIMED_GPIO_H 17 - #define _LINUX_ANDROID_TIMED_GPIO_H 16 + #ifndef _LINUX_TIMED_GPIO_H 17 + #define _LINUX_TIMED_GPIO_H 18 18 19 19 struct timed_gpio { 20 20 const char *name;
+15 -15
drivers/staging/android/timed_gpio.c
··· 1 - /* drivers/android/timed_gpio.c 1 + /* drivers/misc/timed_gpio.c 2 2 * 3 3 * Copyright (C) 2008 Google, Inc. 4 4 * Author: Mike Lockwood <lockwood@android.com> ··· 20 20 #include <linux/err.h> 21 21 #include <asm/arch/gpio.h> 22 22 23 - #include "android_timed_gpio.h" 23 + #include "timed_gpio.h" 24 24 25 25 26 26 static struct class *timed_gpio_class; ··· 88 88 89 89 static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, gpio_enable_show, gpio_enable_store); 90 90 91 - static int android_timed_gpio_probe(struct platform_device *pdev) 91 + static int timed_gpio_probe(struct platform_device *pdev) 92 92 { 93 93 struct timed_gpio_platform_data *pdata = pdev->dev.platform_data; 94 94 struct timed_gpio *cur_gpio; ··· 130 130 return 0; 131 131 } 132 132 133 - static int android_timed_gpio_remove(struct platform_device *pdev) 133 + static int timed_gpio_remove(struct platform_device *pdev) 134 134 { 135 135 struct timed_gpio_platform_data *pdata = pdev->dev.platform_data; 136 136 struct timed_gpio_data *gpio_data = platform_get_drvdata(pdev); ··· 146 146 return 0; 147 147 } 148 148 149 - static struct platform_driver android_timed_gpio_driver = { 150 - .probe = android_timed_gpio_probe, 151 - .remove = android_timed_gpio_remove, 149 + static struct platform_driver timed_gpio_driver = { 150 + .probe = timed_gpio_probe, 151 + .remove = timed_gpio_remove, 152 152 .driver = { 153 - .name = "android-timed-gpio", 153 + .name = "timed-gpio", 154 154 .owner = THIS_MODULE, 155 155 }, 156 156 }; 157 157 158 - static int __init android_timed_gpio_init(void) 158 + static int __init timed_gpio_init(void) 159 159 { 160 160 timed_gpio_class = class_create(THIS_MODULE, "timed_output"); 161 161 if (IS_ERR(timed_gpio_class)) 162 162 return PTR_ERR(timed_gpio_class); 163 - return platform_driver_register(&android_timed_gpio_driver); 163 + return platform_driver_register(&timed_gpio_driver); 164 164 } 165 165 166 - static void __exit android_timed_gpio_exit(void) 166 + static void __exit timed_gpio_exit(void) 167 167 { 168 168 class_destroy(timed_gpio_class); 169 - platform_driver_unregister(&android_timed_gpio_driver); 169 + platform_driver_unregister(&timed_gpio_driver); 170 170 } 171 171 172 - module_init(android_timed_gpio_init); 173 - module_exit(android_timed_gpio_exit); 172 + module_init(timed_gpio_init); 173 + module_exit(timed_gpio_exit); 174 174 175 175 MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>"); 176 - MODULE_DESCRIPTION("Android timed gpio driver"); 176 + MODULE_DESCRIPTION("timed gpio driver"); 177 177 MODULE_LICENSE("GPL");