linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Priit Laes <plaes@plaes.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Priit Laes <plaes@plaes.org>
Subject: [PATCH 11/14] staging: csr: unifi_wext.h: Remove KERNEL_VERSION checks
Date: Sat,  1 Sep 2012 12:06:07 +0300	[thread overview]
Message-ID: <1346490370-32438-12-git-send-email-plaes@plaes.org> (raw)
In-Reply-To: <1346490370-32438-1-git-send-email-plaes@plaes.org>


Signed-off-by: Priit Laes <plaes@plaes.org>
---
 drivers/staging/csr/unifi_wext.h | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/csr/unifi_wext.h b/drivers/staging/csr/unifi_wext.h
index 6d7a995..beba089 100644
--- a/drivers/staging/csr/unifi_wext.h
+++ b/drivers/staging/csr/unifi_wext.h
@@ -70,15 +70,9 @@ uf_iwe_stream_add_point(struct iw_request_info *info, char *start, char *stop,
 {
     char *new_start;
 
-    new_start = iwe_stream_add_point(
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) || defined (IW_REQUEST_FLAG_COMPAT)
-                                     info,
-#endif
-                                     start, stop, piwe, extra);
+    new_start = iwe_stream_add_point(info, start, stop, piwe, extra);
     if (unlikely(new_start == start))
-    {
         return -E2BIG;
-    }
 
     return (new_start - start);
 }
@@ -90,14 +84,9 @@ uf_iwe_stream_add_event(struct iw_request_info *info, char *start, char *stop,
 {
     char *new_start;
 
-    new_start = iwe_stream_add_event(
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) || defined(IW_REQUEST_FLAG_COMPAT)
-                                     info,
-#endif
-                                     start, stop, piwe, len);
-    if (unlikely(new_start == start)) {
+    new_start = iwe_stream_add_event(info, start, stop, piwe, len);
+    if (unlikely(new_start == start))
         return -E2BIG;
-    }
 
     return (new_start - start);
 }
@@ -108,14 +97,9 @@ uf_iwe_stream_add_value(struct iw_request_info *info, char *stream, char *start,
 {
     char *new_start;
 
-    new_start = iwe_stream_add_value(
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) || defined(IW_REQUEST_FLAG_COMPAT)
-                                     info,
-#endif
-                                     stream, start, stop, piwe, len);
-    if (unlikely(new_start == start)) {
+    new_start = iwe_stream_add_value(info, stream, start, stop, piwe, len);
+    if (unlikely(new_start == start))
         return -E2BIG;
-    }
 
     return (new_start - start);
 }
-- 
1.7.12


  parent reply	other threads:[~2012-09-01  9:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-01  9:05 [PATCH 00/14] staging: csr: Remove kernel version checks Priit Laes
2012-09-01  9:05 ` [PATCH 01/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: <=2.6.25 Priit Laes
2012-09-01  9:05 ` [PATCH 02/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.27 Priit Laes
2012-09-01  9:05 ` [PATCH 03/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.28 Priit Laes
2012-09-01  9:06 ` [PATCH 04/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.29 Priit Laes
2012-09-01  9:06 ` [PATCH 05/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32 Priit Laes
2012-09-01  9:06 ` [PATCH 06/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34 Priit Laes
2012-09-01  9:06 ` [PATCH 07/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.37 Priit Laes
2012-09-01  9:06 ` [PATCH 08/14] staging: csr: remove unused define ALLOW_Q_PAUSE Priit Laes
2012-09-01  9:06 ` [PATCH 09/14] staging: csr: Drop unused UNIFI_NET_NAME configuration option Priit Laes
2012-09-01  9:06 ` [PATCH 10/14] staging: csr: drv.c: Remove KERNEL_VERSION checks and associated defines Priit Laes
2012-09-01  9:06 ` Priit Laes [this message]
2012-09-01  9:06 ` [PATCH 12/14] staging: csr: unifi_priv.h: Remove KERNEL_VERSION checks Priit Laes
2012-09-01  9:06 ` [PATCH 13/14] staging: csr: Remove unneeded UF_NETIF_TX_* macros Priit Laes
2012-09-01  9:06 ` [PATCH 14/14] staging: csr: Remove all leftover kernel version checks \o/ Priit Laes

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=1346490370-32438-12-git-send-email-plaes@plaes.org \
    --to=plaes@plaes.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).