From 2e24aa3513ac7238c7d16ae395fe592af4db1673 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Tue, 23 Dec 2008 10:28:02 -0500 Subject: Staging: android: timed_gpio: Rename android_timed_gpio to timed_gpio From: Mike Lockwood Signed-off-by: Mike Lockwood Signed-off-by: Greg Kroah-Hartman --- drivers/staging/android/android_timed_gpio.h | 31 --------------------------- drivers/staging/android/timed_gpio.c | 30 +++++++++++++------------- drivers/staging/android/timed_gpio.h | 31 +++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 46 deletions(-) --- a/drivers/staging/android/android_timed_gpio.h +++ /dev/null @@ -1,31 +0,0 @@ -/* include/linux/android_timed_gpio.h - * - * Copyright (C) 2008 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * -*/ - -#ifndef _LINUX_ANDROID_TIMED_GPIO_H -#define _LINUX_ANDROID_TIMED_GPIO_H - -struct timed_gpio { - const char *name; - unsigned gpio; - int max_timeout; - u8 active_low; -}; - -struct timed_gpio_platform_data { - int num_gpios; - struct timed_gpio *gpios; -}; - -#endif --- a/drivers/staging/android/timed_gpio.c +++ b/drivers/staging/android/timed_gpio.c @@ -1,4 +1,4 @@ -/* drivers/android/timed_gpio.c +/* drivers/misc/timed_gpio.c * * Copyright (C) 2008 Google, Inc. * Author: Mike Lockwood @@ -20,7 +20,7 @@ #include #include -#include "android_timed_gpio.h" +#include "timed_gpio.h" static struct class *timed_gpio_class; @@ -88,7 +88,7 @@ static ssize_t gpio_enable_store( static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, gpio_enable_show, gpio_enable_store); -static int android_timed_gpio_probe(struct platform_device *pdev) +static int timed_gpio_probe(struct platform_device *pdev) { struct timed_gpio_platform_data *pdata = pdev->dev.platform_data; struct timed_gpio *cur_gpio; @@ -130,7 +130,7 @@ static int android_timed_gpio_probe(stru return 0; } -static int android_timed_gpio_remove(struct platform_device *pdev) +static int timed_gpio_remove(struct platform_device *pdev) { struct timed_gpio_platform_data *pdata = pdev->dev.platform_data; struct timed_gpio_data *gpio_data = platform_get_drvdata(pdev); @@ -146,32 +146,32 @@ static int android_timed_gpio_remove(str return 0; } -static struct platform_driver android_timed_gpio_driver = { - .probe = android_timed_gpio_probe, - .remove = android_timed_gpio_remove, +static struct platform_driver timed_gpio_driver = { + .probe = timed_gpio_probe, + .remove = timed_gpio_remove, .driver = { - .name = "android-timed-gpio", + .name = "timed-gpio", .owner = THIS_MODULE, }, }; -static int __init android_timed_gpio_init(void) +static int __init timed_gpio_init(void) { timed_gpio_class = class_create(THIS_MODULE, "timed_output"); if (IS_ERR(timed_gpio_class)) return PTR_ERR(timed_gpio_class); - return platform_driver_register(&android_timed_gpio_driver); + return platform_driver_register(&timed_gpio_driver); } -static void __exit android_timed_gpio_exit(void) +static void __exit timed_gpio_exit(void) { class_destroy(timed_gpio_class); - platform_driver_unregister(&android_timed_gpio_driver); + platform_driver_unregister(&timed_gpio_driver); } -module_init(android_timed_gpio_init); -module_exit(android_timed_gpio_exit); +module_init(timed_gpio_init); +module_exit(timed_gpio_exit); MODULE_AUTHOR("Mike Lockwood "); -MODULE_DESCRIPTION("Android timed gpio driver"); +MODULE_DESCRIPTION("timed gpio driver"); MODULE_LICENSE("GPL"); --- /dev/null +++ b/drivers/staging/android/timed_gpio.h @@ -0,0 +1,31 @@ +/* include/linux/timed_gpio.h + * + * Copyright (C) 2008 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * +*/ + +#ifndef _LINUX_TIMED_GPIO_H +#define _LINUX_TIMED_GPIO_H + +struct timed_gpio { + const char *name; + unsigned gpio; + int max_timeout; + u8 active_low; +}; + +struct timed_gpio_platform_data { + int num_gpios; + struct timed_gpio *gpios; +}; + +#endif