Skip to contentSkip to conversation

android: remove timed output/gpio driver

PATCH In review Rob Herring 3 participants 3 messages Mar 24, 2016 – Mar 31, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 android: remove timed output/gpio driver

timed_output was only used by the Android vibrator HAL which has now learned how to use LED triggers instead[1]. Any users of it in AOSP are on ancient kernels. Adding support for LED triggers is purely DT changes and proper kernel config.

[1] https://android.googlesource.com/platform%2Fhardware%2Flibhardware/+/61701df363310a5cbd95e3e1638baa9526e42c9b

Cc John Stultz <[email protected]>
Cc "Arve Hjønnevåg" <[email protected]>
Cc Riley Andrews <[email protected]>
---
 drivers/staging/android/Kconfig        |  14 ---
 drivers/staging/android/Makefile       |   2 -
 drivers/staging/android/timed_gpio.c   | 166 ---------------------------------
 drivers/staging/android/timed_gpio.h   |  33 -------
 drivers/staging/android/timed_output.c | 110 ----------------------
 drivers/staging/android/timed_output.h |  37 --------
 6 files changed, 362 deletions(-)
 delete mode 100644 drivers/staging/android/timed_gpio.c
 delete mode 100644 drivers/staging/android/timed_gpio.h
 delete mode 100644 drivers/staging/android/timed_output.c
 delete mode 100644 drivers/staging/android/timed_output.h
drivers/staging/android/Kconfig +0 -14
index bd90d20..4244821 100644
@@ -14,20 +14,6 @@ config ASHMEM
 	  It is, in theory, a good memory allocator for low-memory devices,
 	  because it can discard shared memory units when under memory pressure.
 
-config ANDROID_TIMED_OUTPUT
-	bool "Timed output class driver"
-	default y
-
-config ANDROID_TIMED_GPIO
-	tristate "Android timed gpio driver"
-	depends on GPIOLIB || COMPILE_TEST
-	depends on ANDROID_TIMED_OUTPUT
-	default n
-        ---help---
-	  Unlike generic gpio is to allow programs to access and manipulate gpio
-	  registers from user space, timed output/gpio is a system to allow changing
-	  a gpio pin and restore it automatically after a specified timeout.
-
 config ANDROID_LOW_MEMORY_KILLER
 	bool "Android Low Memory Killer"
 	---help---
drivers/staging/android/Makefile +0 -2
index c7b6c99..980d6dc 100644
@@ -3,8 +3,6 @@ ccflags-y += -I$(src)			# needed for trace events
 obj-y					+= ion/
 
 obj-$(CONFIG_ASHMEM)			+= ashmem.o
-obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o
-obj-$(CONFIG_ANDROID_TIMED_GPIO)	+= timed_gpio.o
 obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)	+= lowmemorykiller.o
 obj-$(CONFIG_SYNC)			+= sync.o sync_debug.o
 obj-$(CONFIG_SW_SYNC)			+= sw_sync.o
drivers/staging/android/timed_gpio.c deleted +0 -166

166 lines not on this page · raw message

drivers/staging/android/timed_gpio.h deleted +0 -33
deleted file mode 100644
index d29e169..0000000
@@ -1,33 +0,0 @@
-/* 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
-
-#define TIMED_GPIO_NAME "timed-gpio"
-
-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
drivers/staging/android/timed_output.c deleted +0 -110

110 lines not on this page · raw message

drivers/staging/android/timed_output.h deleted +0 -37
deleted file mode 100644
index 13d2ca5..0000000
@@ -1,37 +0,0 @@
-/* include/linux/timed_output.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_OUTPUT_H
-#define _LINUX_TIMED_OUTPUT_H
-
-struct timed_output_dev {
-	const char	*name;
-
-	/* enable the output and set the timer */
-	void (*enable)(struct timed_output_dev *sdev, int timeout);
-
-	/* returns the current number of milliseconds remaining on the timer */
-	int (*get_time)(struct timed_output_dev *sdev);
-
-	/* private data */
-	struct device	*dev;
-	int		index;
-	int		state;
-};
-
-int timed_output_dev_register(struct timed_output_dev *dev);
-void timed_output_dev_unregister(struct timed_output_dev *dev);
-
-#endif
Signature · 1 line
2.5.0
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Rob Herring

timed_output was only used by the Android vibrator HAL which has now learned how to use LED triggers instead[1]. Any users of it in AOSP are on ancient kernels. Adding support for LED triggers is purely DT changes and proper kernel config.

[1] https://android.googlesource.com/platform%2Fhardware%2Flibhardware/+/61701df363310a5cbd95e3e1638baa9526e42c9b

Cc John Stultz <[email protected]>
Cc "Arve Hjønnevåg" <[email protected]>
Cc Riley Andrews <[email protected]>

Added a few other key emails to the CC here to give folks a chance to object.

But from my POV:

thanks
-john

#2 lore raw
Quoted 13 lines · John Stultz
Quoted 11 lines · Rob Herring

timed_output was only used by the Android vibrator HAL which has now learned how to use LED triggers instead[1]. Any users of it in AOSP are on ancient kernels. Adding support for LED triggers is purely DT changes and proper kernel config.

[1] https://android.googlesource.com/platform%2Fhardware%2Flibhardware/+/61701df363310a5cbd95e3e1638baa9526e42c9b

Cc John Stultz <[email protected]>
Cc "Arve Hjønnevåg" <[email protected]>
Cc Riley Andrews <[email protected]>
Quoted 4 lines

Added a few other key emails to the CC here to give folks a chance to object.

But from my POV:

Given that we said we would delete this many months ago, I think we are safe :)

I'll queue this up now.

thanks,

greg k-h