diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-26 14:13:26 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:07 -0700 |
| commit | 47881dd94640efa9ff682b362ab699b12e8e276a (patch) | |
| tree | a7551e150c63b718e74e14e6f87e65d68ef310f2 /drivers/staging/slicoss | |
| parent | Staging: slicoss: remove SLIC_PING_TIMER_ENABLED (diff) | |
| download | linux-dev-47881dd94640efa9ff682b362ab699b12e8e276a.tar.xz linux-dev-47881dd94640efa9ff682b362ab699b12e8e276a.zip | |
Staging: slicoss: remove VALID_ADDRESS macro
It's quite wierd, and doesn't even do anything on x86_64, so just delete
it.
Cc: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/slicoss')
| -rw-r--r-- | drivers/staging/slicoss/slicdbg.h | 5 | ||||
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/slicoss/slicdbg.h b/drivers/staging/slicoss/slicdbg.h index c54e44fb1f63..a7aba05ab098 100644 --- a/drivers/staging/slicoss/slicdbg.h +++ b/drivers/staging/slicoss/slicdbg.h @@ -62,11 +62,6 @@ #endif #if SLIC_ASSERT_ENABLED -#ifdef CONFIG_X86_64 -#define VALID_ADDRESS(p) (1) -#else -#define VALID_ADDRESS(p) (((u32)(p) & 0x80000000) || ((u32)(p) == 0)) -#endif #ifndef ASSERT #define ASSERT(a) \ { \ diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index f3e369b9d5b9..b5a77923f226 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -3818,13 +3818,11 @@ static void slic_cmdq_addcmdpage(struct adapter *adapter, u32 *page) cmdq = &adapter->cmdq_all; cmdq->count += cmdcnt; /* SLIC_CMDQ_CMDSINPAGE; mooktodo */ tail->next_all = cmdq->head; - ASSERT(VALID_ADDRESS(prev)); cmdq->head = prev; cmdq = &adapter->cmdq_free; spin_lock_irqsave(&cmdq->lock.lock, cmdq->lock.flags); cmdq->count += cmdcnt; /* SLIC_CMDQ_CMDSINPAGE; mooktodo */ tail->next = cmdq->head; - ASSERT(VALID_ADDRESS(prev)); cmdq->head = prev; spin_unlock_irqrestore(&cmdq->lock.lock, cmdq->lock.flags); } @@ -3869,7 +3867,6 @@ static void slic_cmdq_getdone(struct adapter *adapter) ASSERT(free_cmdq->head == NULL); spin_lock_irqsave(&done_cmdq->lock.lock, done_cmdq->lock.flags); - ASSERT(VALID_ADDRESS(done_cmdq->head)); free_cmdq->head = done_cmdq->head; free_cmdq->count = done_cmdq->count; @@ -3886,9 +3883,7 @@ static void slic_cmdq_putdone_irq(struct adapter *adapter, spin_lock(&cmdq->lock.lock); cmd->busy = 0; - ASSERT(VALID_ADDRESS(cmdq->head)); cmd->next = cmdq->head; - ASSERT(VALID_ADDRESS(cmd)); cmdq->head = cmd; cmdq->count++; if ((adapter->xmitq_full) && (cmdq->count > 10)) |