From eb050f4c014d5d72c01db91843fe139dcc1cb292 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Wed, 4 May 2011 14:23:55 +0530 Subject: [PATCH] ath6kl: Remove gpio.h and gpio_api.h The macros and function proto types in these files are not used anywhere. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ath6kl/include/common/gpio.h | 45 -------------- drivers/staging/ath6kl/include/common/wmix.h | 1 - drivers/staging/ath6kl/include/gpio_api.h | 59 ------------------- .../ath6kl/os/linux/include/ar6000_drv.h | 2 - drivers/staging/ath6kl/wmi/wmi.c | 1 - 5 files changed, 108 deletions(-) delete mode 100644 drivers/staging/ath6kl/include/common/gpio.h delete mode 100644 drivers/staging/ath6kl/include/gpio_api.h diff --git a/drivers/staging/ath6kl/include/common/gpio.h b/drivers/staging/ath6kl/include/common/gpio.h deleted file mode 100644 index f7230667dd66..000000000000 --- a/drivers/staging/ath6kl/include/common/gpio.h +++ /dev/null @@ -1,45 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2005-2010 Atheros Corporation. All rights reserved. -// -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// -// -// Author(s): ="Atheros" -//------------------------------------------------------------------------------ - -#define AR6001_GPIO_PIN_COUNT 18 -#define AR6002_GPIO_PIN_COUNT 18 -#define AR6003_GPIO_PIN_COUNT 28 - -/* - * Possible values for WMIX_GPIO_SET_REGISTER_CMDID. - * NB: These match hardware order, so that addresses can - * easily be computed. - */ -#define GPIO_ID_OUT 0x00000000 -#define GPIO_ID_OUT_W1TS 0x00000001 -#define GPIO_ID_OUT_W1TC 0x00000002 -#define GPIO_ID_ENABLE 0x00000003 -#define GPIO_ID_ENABLE_W1TS 0x00000004 -#define GPIO_ID_ENABLE_W1TC 0x00000005 -#define GPIO_ID_IN 0x00000006 -#define GPIO_ID_STATUS 0x00000007 -#define GPIO_ID_STATUS_W1TS 0x00000008 -#define GPIO_ID_STATUS_W1TC 0x00000009 -#define GPIO_ID_PIN0 0x0000000a -#define GPIO_ID_PIN(n) (GPIO_ID_PIN0+(n)) - -#define GPIO_LAST_REGISTER_ID GPIO_ID_PIN(17) -#define GPIO_ID_NONE 0xffffffff diff --git a/drivers/staging/ath6kl/include/common/wmix.h b/drivers/staging/ath6kl/include/common/wmix.h index 1ab6fc532934..9435eab1b7f5 100644 --- a/drivers/staging/ath6kl/include/common/wmix.h +++ b/drivers/staging/ath6kl/include/common/wmix.h @@ -144,7 +144,6 @@ typedef PREPACK struct { * All masks are 18-bit masks with bit N operating on GPIO pin N. */ -#include "gpio.h" /* * Set GPIO pin output state. diff --git a/drivers/staging/ath6kl/include/gpio_api.h b/drivers/staging/ath6kl/include/gpio_api.h deleted file mode 100644 index 6b4c547432e9..000000000000 --- a/drivers/staging/ath6kl/include/gpio_api.h +++ /dev/null @@ -1,59 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Copyright (c) 2004-2010 Atheros Corporation. All rights reserved. -// -// -// Permission to use, copy, modify, and/or distribute this software for any -// purpose with or without fee is hereby granted, provided that the above -// copyright notice and this permission notice appear in all copies. -// -// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// -//------------------------------------------------------------------------------ -//============================================================================== -// Host-side General Purpose I/O API. -// -// Author(s): ="Atheros" -//============================================================================== -#ifndef _GPIO_API_H_ -#define _GPIO_API_H_ - -/* - * Send a command to the Target in order to change output on GPIO pins. - */ -int wmi_gpio_output_set(struct wmi_t *wmip, - u32 set_mask, - u32 clear_mask, - u32 enable_mask, - u32 disable_mask); - -/* - * Send a command to the Target requesting input state of GPIO pins. - */ -int wmi_gpio_input_get(struct wmi_t *wmip); - -/* - * Send a command to the Target to change the value of a GPIO register. - */ -int wmi_gpio_register_set(struct wmi_t *wmip, - u32 gpioreg_id, - u32 value); - -/* - * Send a command to the Target to fetch the value of a GPIO register. - */ -int wmi_gpio_register_get(struct wmi_t *wmip, u32 gpioreg_id); - -/* - * Send a command to the Target, acknowledging some GPIO interrupts. - */ -int wmi_gpio_intr_ack(struct wmi_t *wmip, u32 ack_mask); - -#endif /* _GPIO_API_H_ */ diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index 081e877e5df1..5bb45c94d7d1 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h @@ -48,8 +48,6 @@ #include #include #include -#include "gpio_api.h" -#include "gpio.h" #include "pkt_log.h" #include "aggr_recv_api.h" #include diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index 781c65620835..4a17f99ea143 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c @@ -34,7 +34,6 @@ #include #include #include "dset_api.h" -#include "gpio_api.h" #include "wmi_host.h" #include "a_drv.h" #include "a_drv_api.h"