From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Subject: [PATCH 2/2] staging: wlags49_h2: remove custom macros min() and max()
Date: Tue, 12 Oct 2010 16:22:49 +0300 [thread overview]
Message-ID: <6a47ed73fed16a1b398ec4e171fbedad9700a335.1286889640.git.ext-andriy.shevchenko@nokia.com> (raw)
In-Reply-To: <58ee6c5338ae1c6dc18633e48fad1b753c0f7ec7.1286889640.git.ext-andriy.shevchenko@nokia.com>
In-Reply-To: <58ee6c5338ae1c6dc18633e48fad1b753c0f7ec7.1286889640.git.ext-andriy.shevchenko@nokia.com>
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
---
drivers/staging/wlags49_h2/hcf.c | 1 +
drivers/staging/wlags49_h2/hcfdef.h | 8 --------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c
index c4fe0ec..d4bdd3e 100644
--- a/drivers/staging/wlags49_h2/hcf.c
+++ b/drivers/staging/wlags49_h2/hcf.c
@@ -92,6 +92,7 @@
#include "hcf.h" // HCF and MSF common include file
#include "hcfdef.h" // HCF specific include file
#include "mmd.h" // MoreModularDriver common include file
+#include <linux/kernel.h>
#if ! defined offsetof
#define offsetof(s,m) ((unsigned int)&(((s *)0)->m))
diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h
index f7e74bf..4e20171 100644
--- a/drivers/staging/wlags49_h2/hcfdef.h
+++ b/drivers/staging/wlags49_h2/hcfdef.h
@@ -593,14 +593,6 @@ err: ;
/************************************** MACROS ************************************************/
/************************************************************************************************/
-/* min and max macros */
-#if ! defined max
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-#endif
-#if ! defined min
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
#ifdef HCF_SLEEP
#if defined MSF_WAIT
err: MSF should no longer supply this macro;
--
1.6.3.3
prev parent reply other threads:[~2010-10-12 13:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 13:22 [PATCH 1/2] staging: rt2860: remove custom " Andy Shevchenko
2010-10-12 13:22 ` Andy Shevchenko [this message]
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=6a47ed73fed16a1b398ec4e171fbedad9700a335.1286889640.git.ext-andriy.shevchenko@nokia.com \
--to=andy.shevchenko@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=ext-andriy.shevchenko@nokia.com \
--cc=gregkh@suse.de \
--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
all inboxes | Powered by JetHome®