diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-26 15:46:06 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:08 -0700 |
| commit | a750c1c525dcfd2e134aba589a630212df39ea8d (patch) | |
| tree | 54df0c73914a8a24869e635ddb1b3513f915b909 /drivers/staging/slicoss/slicoss.c | |
| parent | 8665b184749dbb3b55313e60e27ff93296f95d18 (diff) | |
| download | kernel_samsung_smdk4412-a750c1c525dcfd2e134aba589a630212df39ea8d.zip kernel_samsung_smdk4412-a750c1c525dcfd2e134aba589a630212df39ea8d.tar.gz kernel_samsung_smdk4412-a750c1c525dcfd2e134aba589a630212df39ea8d.tar.bz2 | |
Staging: slicoss: delete slicdbg.h
Move the ASSERT macro into slicoss.c as that's all that is currently
being used.
Cc: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/slicoss/slicoss.c')
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 4e485d8..953684f 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -58,7 +58,6 @@ #define KLUDGE_FOR_4GB_BOUNDARY 1 #define DEBUG_MICROCODE 1 #define DBG 1 -#define SLIC_ASSERT_ENABLED 1 #define SLIC_INTERRUPT_PROCESS_LIMIT 1 #define SLIC_OFFLOAD_IP_CHECKSUM 1 #define STATS_TIMER_INTERVAL 2 @@ -95,7 +94,6 @@ #include <linux/ethtool.h> #include <linux/uaccess.h> -#include "slicdbg.h" #include "slichw.h" #include "slic.h" @@ -208,6 +206,21 @@ static struct pci_device_id slic_pci_tbl[] __devinitdata = { MODULE_DEVICE_TABLE(pci, slic_pci_tbl); +#ifdef ASSERT +#undef ASSERT +#endif + +#ifndef ASSERT +#define ASSERT(a) do { \ + if (!(a)) { \ + printk(KERN_ERR "slicoss ASSERT() Failure: function %s" \ + "line %d\n", __func__, __LINE__); \ + slic_assert_fail(); \ + } \ +} while (0) +#endif + + #define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle) \ { \ spin_lock_irqsave(&_adapter->handle_lock.lock, \ |