Commit a252d02f authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

staging: wlags49_h2: remove custom macros min() and max() 



Signed-off-by: default avatarAndy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 97eea3af

drivers/staging/wlags49_h2/hcf.c

+1 −0
Original line number Diff line number Diff line
@@ -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))

drivers/staging/wlags49_h2/hcfdef.h

+0 −8
Original line number Diff line number Diff line
@@ -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;