From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 55CF01BFBC3 for ; Tue, 18 Apr 2017 00:35:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B57F985CAA for ; Tue, 18 Apr 2017 00:35:56 +0000 (UTC) Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qCTMfaez9FA9 for ; Tue, 18 Apr 2017 00:35:56 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by whitealder.osuosl.org (Postfix) with ESMTPS id 178E484F09 for ; Tue, 18 Apr 2017 00:35:56 +0000 (UTC) From: "Tobin C. Harding" Subject: [PATCH 01/15] staging: ks7010: create reg_status_type enum type Date: Tue, 18 Apr 2017 10:35:29 +1000 Message-Id: <1492475743-25189-2-git-send-email-me@tobin.cc> In-Reply-To: <1492475743-25189-1-git-send-email-me@tobin.cc> References: <1492475743-25189-1-git-send-email-me@tobin.cc> List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" To: Greg Kroah-Hartman Cc: Wolfram Sang , driverdev-devel@linuxdriverproject.org SDIO header currently defines unused constants READ_STATUS_BUSY and WRITE_STATUS_IDLE. There are reciprocal constants that are used READ_STATUS_IDLE and WRITE_STATUS_BUSY. We can roll these into a single enumeration type and remove the two that are unused. Add enumeration type containing IDLE/BUSY pair that are currently used within the SDIO source. Change source to use new enum types. Signed-off-by: Tobin C. Harding --- drivers/staging/ks7010/ks7010_sdio.c | 6 +++--- drivers/staging/ks7010/ks7010_sdio.h | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index 59451f8..b103a20 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -295,7 +295,7 @@ static int write_to_device(struct ks_wlan_private *priv, unsigned char *buffer, return ret; } - rw_data = WRITE_STATUS_BUSY; + rw_data = REG_STATUS_BUSY; ret = ks7010_sdio_write(priv, WRITE_STATUS, &rw_data, sizeof(rw_data)); if (ret) { DPRINTK(1, " error : WRITE_STATUS=%02X\n", rw_data); @@ -415,7 +415,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) rx_buffer->data, 32); #endif /* rx_status update */ - read_status = READ_STATUS_IDLE; + read_status = REG_STATUS_IDLE; ret = ks7010_sdio_write(priv, READ_STATUS, &read_status, sizeof(read_status)); if (ret) @@ -431,7 +431,7 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) inc_rxqtail(priv); /* read status update */ - read_status = READ_STATUS_IDLE; + read_status = REG_STATUS_IDLE; ret = ks7010_sdio_write(priv, READ_STATUS, &read_status, sizeof(read_status)); if (ret) diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h index c01a020..0b8b865 100644 --- a/drivers/staging/ks7010/ks7010_sdio.h +++ b/drivers/staging/ks7010/ks7010_sdio.h @@ -22,10 +22,13 @@ /* Older sources suggest earlier versions were named 7910 or 79xx */ #define SDIO_DEVICE_ID_KS_7010 0x7910 -/* Read Status Register */ +/* Read/Write Status Register */ #define READ_STATUS 0x000000 -#define READ_STATUS_BUSY 0 -#define READ_STATUS_IDLE 1 +#define WRITE_STATUS 0x00000C +enum reg_status_type { + REG_STATUS_BUSY, + REG_STATUS_IDLE +}; /* Read Index Register */ #define READ_INDEX 0x000004 @@ -33,11 +36,6 @@ /* Read Data Size Register */ #define READ_DATA_SIZE 0x000008 -/* Write Status Register */ -#define WRITE_STATUS 0x00000C -#define WRITE_STATUS_BUSY 0 -#define WRITE_STATUS_IDLE 1 - /* Write Index Register */ #define WRITE_INDEX 0x000010 -- 2.7.4 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel