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>

diff --git a/drivers/staging/slicoss/slicdbg.h b/drivers/staging/slicoss/slicdbg.h
index c54e44fb1f635d291fcdca8a8a8de813501daade..a7aba05ab0981bd6310e78fe27a83a4e120082c2 100644 (file)
--- 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 f3e369b9d5b9a64c487a5cfa76db3a218d338146..b5a77923f2260865f83601a916f224bd8b6c3228 100644 (file)
--- 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))