mirror of
https://github.com/torvalds/linux
synced 2024-10-24 12:17:07 +00:00
staging: wlags49_h2: remove custom macros min() and max()
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
97eea3afa2
commit
a252d02f89
|
@ -92,6 +92,7 @@
|
||||||
#include "hcf.h" // HCF and MSF common include file
|
#include "hcf.h" // HCF and MSF common include file
|
||||||
#include "hcfdef.h" // HCF specific include file
|
#include "hcfdef.h" // HCF specific include file
|
||||||
#include "mmd.h" // MoreModularDriver common include file
|
#include "mmd.h" // MoreModularDriver common include file
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
|
||||||
#if ! defined offsetof
|
#if ! defined offsetof
|
||||||
#define offsetof(s,m) ((unsigned int)&(((s *)0)->m))
|
#define offsetof(s,m) ((unsigned int)&(((s *)0)->m))
|
||||||
|
|
|
@ -593,14 +593,6 @@ err: ;
|
||||||
/************************************** MACROS ************************************************/
|
/************************************** 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
|
#ifdef HCF_SLEEP
|
||||||
#if defined MSF_WAIT
|
#if defined MSF_WAIT
|
||||||
err: MSF should no longer supply this macro;
|
err: MSF should no longer supply this macro;
|
||||||
|
|
Loading…
Reference in a new issue