All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Cho <tony.cho@atmel.com>
To: <gregkh@linuxfoundation.org>
Cc: <devel@driverdev.osuosl.org>, <linux-wireless@vger.kernel.org>,
	<johnny.kim@atmel.com>, <chris.park@atmel.com>,
	<rachel.kim@atmel.com>, <austin.shin@atmel.com>,
	<tony.cho@atmel.com>, <glen.lee@atmel.com>, <leo.kim@atmel.com>,
	<jude.lee@atmel.com>, <robin.hwang@atmel.com>,
	<Nicolas.FERRE@atmel.com>
Subject: [PATCH 08/21] staging: wilc1000: remove a dead preprocessor conditionals
Date: Tue, 28 Jul 2015 17:47:27 +0900	[thread overview]
Message-ID: <1438073261-28315-9-git-send-email-tony.cho@atmel.com> (raw)
In-Reply-To: <1438073261-28315-1-git-send-email-tony.cho@atmel.com>

This patch removes the preprocessor conditionals which are related to
the WILC1000_SINGLE_TRANSFER definition becasue this is not used.

Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/wilc_sdio.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index ea545c9..8f674ad 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -10,11 +10,7 @@
 #include "wilc_wlan_if.h"
 #include "wilc_wlan.h"
 
-#ifdef WILC1000_SINGLE_TRANSFER
-#define WILC_SDIO_BLOCK_SIZE 256
-#else
 #define WILC_SDIO_BLOCK_SIZE 512
-#endif
 
 typedef struct {
 	void *os_context;
@@ -321,16 +317,6 @@ static int sdio_write(uint32_t addr, uint8_t *buf, uint32_t size)
 		cmd.function = 0;
 		cmd.address = 0x10f;
 	} else {
-#ifdef WILC1000_SINGLE_TRANSFER
-		/**
-		 *      has to be block aligned...
-		 **/
-		nleft = size % block_size;
-		if (nleft > 0) {
-			size += block_size;
-			size &= ~(block_size - 1);
-		}
-#else
 		/**
 		 *      has to be word aligned...
 		 **/
@@ -338,7 +324,6 @@ static int sdio_write(uint32_t addr, uint8_t *buf, uint32_t size)
 			size += 4;
 			size &= ~0x3;
 		}
-#endif
 
 		/**
 		 *      func 1 access
@@ -463,16 +448,6 @@ static int sdio_read(uint32_t addr, uint8_t *buf, uint32_t size)
 		cmd.function = 0;
 		cmd.address = 0x10f;
 	} else {
-#ifdef WILC1000_SINGLE_TRANSFER
-		/**
-		 *      has to be block aligned...
-		 **/
-		nleft = size % block_size;
-		if (nleft > 0) {
-			size += block_size;
-			size &= ~(block_size - 1);
-		}
-#else
 		/**
 		 *      has to be word aligned...
 		 **/
@@ -480,7 +455,6 @@ static int sdio_read(uint32_t addr, uint8_t *buf, uint32_t size)
 			size += 4;
 			size &= ~0x3;
 		}
-#endif
 
 		/**
 		 *      func 1 access
-- 
1.9.1


  parent reply	other threads:[~2015-07-28  8:48 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-28  8:47 [PATCH 00/21] cover letter of Atmel WILC1000 patches Tony Cho
2015-07-28  8:47 ` [PATCH 01/21] staging: wilc1000: remove unnecessary files Tony Cho
2015-07-28  8:47 ` [PATCH 02/21] staging: wilc1000: describe the config symbol fully Tony Cho
2015-07-28  8:47 ` [PATCH 03/21] staging: wilc1000: remove dead codes related to SIMULATION Tony Cho
2015-07-28  8:47 ` [PATCH 04/21] staging: wilc1000: remove warnings on the multiple line uses Tony Cho
2015-07-28  8:47 ` [PATCH 05/21] staging: wilc1000: remove the warnings on missing blank line Tony Cho
2015-07-28  8:47 ` [PATCH 06/21] staging: wilc1000: remove the warnings on unnecessary braces Tony Cho
2015-07-29 20:50   ` Greg KH
2015-07-28  8:47 ` [PATCH 07/21] staging: wilc1000: remove preprocessor conditionals unused Tony Cho
2015-07-28  8:47 ` Tony Cho [this message]
2015-07-28  8:47 ` [PATCH 09/21] staging: wilc1000: #ifdef conditionals cover entire functions Tony Cho
2015-07-29 20:54   ` Greg KH
2015-07-29 21:14     ` Dan Carpenter
2015-07-29 21:29       ` Greg KH
2015-07-29 21:37         ` Dan Carpenter
2015-07-28  8:47 ` [PATCH 10/21] staging: wilc1000: remove unused functions Tony Cho
2015-07-28  8:47 ` [PATCH 11/21] staging: wilc1000: remove multiple blank lines Tony Cho
2015-07-28  8:47 ` [PATCH 12/21] staging: wilc1000: alignment should match open parenthesis Tony Cho
2015-07-28  8:47 ` [PATCH 13/21] staging: wilc1000: remove errors on required space Tony Cho
2015-07-28  8:47 ` [PATCH 14/21] staging: wilc1000: remove warnings on unnecessary braces Tony Cho
2015-07-28  8:47 ` [PATCH 15/21] staging: wilc1000: remove warnings on missing blank line Tony Cho
2015-07-28  8:47 ` [PATCH 16/21] staging: wilc1000: remove unnecessary inner braces Tony Cho
2015-07-28  8:47 ` [PATCH 17/21] staging: wilc1000: remove unnecessary blank lines Tony Cho
2015-07-28  8:47 ` [PATCH 18/21] staging: wilc1000: remove braces {} for single statement blocks Tony Cho
2015-07-28  8:47 ` [PATCH 19/21] staging: wilc1000: remove warnings on the multiple blank lines uses Tony Cho
2015-07-28  8:47 ` [PATCH 20/21] staging: wilc1000: remove unnecessary spcae Tony Cho
2015-07-28  8:47 ` [PATCH 21/21] staging: wilc1000: update TODO list of WILC1000 Tony Cho
2015-07-29 21:01   ` Greg KH
     [not found]     ` <55B97E17.5050007@atmel.com>
2015-07-30  1:40       ` Greg KH
2015-07-28  9:28 ` [PATCH 00/21] cover letter of Atmel WILC1000 patches Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438073261-28315-9-git-send-email-tony.cho@atmel.com \
    --to=tony.cho@atmel.com \
    --cc=Nicolas.FERRE@atmel.com \
    --cc=austin.shin@atmel.com \
    --cc=chris.park@atmel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=glen.lee@atmel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=johnny.kim@atmel.com \
    --cc=jude.lee@atmel.com \
    --cc=leo.kim@atmel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=rachel.kim@atmel.com \
    --cc=robin.hwang@atmel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.