Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a256fa5 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley
Browse files

[SCSI] advansys: Remove ASC_WIDE_BOARD predicate 



Replace it with !ASC_NARROW_BOARD

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent ae002fec

drivers/scsi/advansys.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2232,7 +2232,6 @@ do { \ 
#define ASC_IS_WIDE_BOARD       0x04	/* AdvanSys Wide Board */

#define ASC_IS_WIDE_BOARD       0x04	/* AdvanSys Wide Board */





#define ASC_NARROW_BOARD(boardp) (((boardp)->flags & ASC_IS_WIDE_BOARD) == 0)

#define ASC_NARROW_BOARD(boardp) (((boardp)->flags & ASC_IS_WIDE_BOARD) == 0)

#define ASC_WIDE_BOARD(boardp)   ((boardp)->flags & ASC_IS_WIDE_BOARD)





#define NO_ISA_DMA              0xff	/* No ISA DMA Channel Used */

#define NO_ISA_DMA              0xff	/* No ISA DMA Channel Used */
@@ -4385,7 +4384,7 @@ advansys_proc_info(struct Scsi_Host *shost, char *buffer, char **start, 
	/*

	/*

	 * Display Wide Board BIOS Information.

	 * Display Wide Board BIOS Information.

	 */

	 */

	if (ASC_WIDE_BOARD(boardp)) {

	if (!ASC_NARROW_BOARD(boardp)) {

		cp = boardp->prtbuf;

		cp = boardp->prtbuf;

		cplen = asc_prt_adv_bios(shost, cp, ASC_PRTBUF_SIZE);

		cplen = asc_prt_adv_bios(shost, cp, ASC_PRTBUF_SIZE);

		BUG_ON(cplen >= ASC_PRTBUF_SIZE);

		BUG_ON(cplen >= ASC_PRTBUF_SIZE);
@@ -14432,7 +14431,7 @@ static int advansys_release(struct Scsi_Host *shost) 
		ASC_DBG(1, "advansys_release: free_dma()\n");

		ASC_DBG(1, "advansys_release: free_dma()\n");

		free_dma(shost->dma_channel);

		free_dma(shost->dma_channel);

	}

	}

	if (ASC_WIDE_BOARD(boardp)) {

	if (!ASC_NARROW_BOARD(boardp)) {

		iounmap(boardp->ioremap_addr);

		iounmap(boardp->ioremap_addr);

		advansys_wide_free_mem(boardp);

		advansys_wide_free_mem(boardp);

	}

	}