leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: fix integer as NULL pointer warnings

Browse Source 
drivers/scsi/aic7xxx/aic7770_osm.c:53:58: warning: Using plain integer as NULL pointer
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:355:47: warning: Using plain integer as NULL pointer
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:372:55: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:997:28: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:1003:28: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:1165:46: warning: Using plain integer as NULL pointer
drivers/scsi/fdomain.c:1446:40: warning: Using plain integer as NULL pointer
drivers/scsi/sym53c8xx_2/sym_hipd.c:1650:51: warning: Using plain integer as NULL pointer
drivers/scsi/sym53c8xx_2/sym_hipd.c:3171:42: warning: Using plain integer as NULL pointer
drivers/scsi/sym53c8xx_2/sym_hipd.c:5732:52: warning: Using plain integer as NULL pointer
drivers/scsi/ncr53c8xx.c:8189:31: warning: Using plain integer as NULL pointer
drivers/scsi/ncr53c8xx.c:8225:34: warning: Using plain integer as NULL pointer
drivers/scsi/dpt_i2o.c:156:32: warning: Using plain integer as NULL pointer
drivers/scsi/ultrastor.c:954:42: warning: Using plain integer as NULL pointer
drivers/scsi/ultrastor.c:1104:18: warning: Using plain integer as NULL pointer

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Harvey Harrison 2008-04-28 16:50:03 -07:00 committed by Linus Torvalds
parent 8ab68ab420
commit 172c122df5
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/aha152x.c
View File

@ -994,13 +994,13 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete,
SCpnt->SCp.sent_command = 0; SCpnt->SCp.sent_command = 0;
if(SCpnt->SCp.phase & (resetting|check_condition)) { if(SCpnt->SCp.phase & (resetting|check_condition)) {
if(SCpnt->host_scribble==0 || SCSEM(SCpnt) || SCNEXT(SCpnt)) { if (!SCpnt->host_scribble || SCSEM(SCpnt) || SCNEXT(SCpnt)) {
printk(ERR_LEAD "cannot reuse command\n", CMDINFO(SCpnt)); printk(ERR_LEAD "cannot reuse command\n", CMDINFO(SCpnt));
return FAILED; return FAILED;
} }
} else { } else {
SCpnt->host_scribble = kmalloc(sizeof(struct aha152x_scdata), GFP_ATOMIC); SCpnt->host_scribble = kmalloc(sizeof(struct aha152x_scdata), GFP_ATOMIC);
if(SCpnt->host_scribble==0) { if(!SCpnt->host_scribble) {
printk(ERR_LEAD "allocation failed\n", CMDINFO(SCpnt)); printk(ERR_LEAD "allocation failed\n", CMDINFO(SCpnt));
return FAILED; return FAILED;
} }
@ -1162,7 +1162,7 @@ static int aha152x_device_reset(Scsi_Cmnd * SCpnt)
} }
DO_LOCK(flags); DO_LOCK(flags);
issued = remove_SC(&ISSUE_SC, SCpnt)==0; issued = remove_SC(&ISSUE_SC, SCpnt) == NULL;
disconnected = issued && remove_SC(&DISCONNECTED_SC, SCpnt); disconnected = issued && remove_SC(&DISCONNECTED_SC, SCpnt);
DO_UNLOCK(flags); DO_UNLOCK(flags);

2
drivers/scsi/aic7xxx/aic7770_osm.c
View File

@ -50,7 +50,7 @@ aic7770_map_registers(struct ahc_softc *ahc, u_int port)
/* /*
* Lock out other contenders for our i/o space. * Lock out other contenders for our i/o space.
*/ */
if (request_region(port, AHC_EISA_IOSIZE, "aic7xxx") == 0) if (!request_region(port, AHC_EISA_IOSIZE, "aic7xxx"))
return (ENOMEM); return (ENOMEM);
ahc->tag = BUS_SPACE_PIO; ahc->tag = BUS_SPACE_PIO;
ahc->bsh.ioport = port; ahc->bsh.ioport = port;

4
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
View File

@ -352,7 +352,7 @@ ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, resource_size_t *base)
*base = pci_resource_start(ahc->dev_softc, 0); *base = pci_resource_start(ahc->dev_softc, 0);
if (*base == 0) if (*base == 0)
return (ENOMEM); return (ENOMEM);
if (request_region(*base, 256, "aic7xxx") == 0) if (!request_region(*base, 256, "aic7xxx"))
return (ENOMEM); return (ENOMEM);
return (0); return (0);
} }
@ -369,7 +369,7 @@ ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
start = pci_resource_start(ahc->dev_softc, 1); start = pci_resource_start(ahc->dev_softc, 1);
if (start != 0) { if (start != 0) {
*bus_addr = start; *bus_addr = start;
if (request_mem_region(start, 0x1000, "aic7xxx") == 0) if (!request_mem_region(start, 0x1000, "aic7xxx"))
error = ENOMEM; error = ENOMEM;
if (error == 0) { if (error == 0) {
*maddr = ioremap_nocache(start, 256); *maddr = ioremap_nocache(start, 256);

2
drivers/scsi/dpt_i2o.c
View File

@ -153,7 +153,7 @@ static DEFINE_SPINLOCK(adpt_post_wait_lock);
static u8 adpt_read_blink_led(adpt_hba* host) static u8 adpt_read_blink_led(adpt_hba* host)
{ {
if(host->FwDebugBLEDflag_P != 0) { if (host->FwDebugBLEDflag_P) {
if( readb(host->FwDebugBLEDflag_P) == 0xbc ){ if( readb(host->FwDebugBLEDflag_P) == 0xbc ){
return readb(host->FwDebugBLEDvalue_P); return readb(host->FwDebugBLEDvalue_P);
} }

2
drivers/scsi/fdomain.c
View File

@ -1443,7 +1443,7 @@ static int fdomain_16x0_queue(struct scsi_cmnd *SCpnt,
current_SC->SCp.this_residual = current_SC->SCp.buffer->length; current_SC->SCp.this_residual = current_SC->SCp.buffer->length;
current_SC->SCp.buffers_residual = scsi_sg_count(current_SC) - 1; current_SC->SCp.buffers_residual = scsi_sg_count(current_SC) - 1;
} else { } else {
current_SC->SCp.ptr = 0; current_SC->SCp.ptr = NULL;
current_SC->SCp.this_residual = 0; current_SC->SCp.this_residual = 0;
current_SC->SCp.buffer = NULL; current_SC->SCp.buffer = NULL;
current_SC->SCp.buffers_residual = 0; current_SC->SCp.buffers_residual = 0;

4
drivers/scsi/ncr53c8xx.c
View File

@ -8186,7 +8186,7 @@ static void insert_into_waiting_list(struct ncb *np, struct scsi_cmnd *cmd)
cmd->next_wcmd = NULL; cmd->next_wcmd = NULL;
if (!(wcmd = np->waiting_list)) np->waiting_list = cmd; if (!(wcmd = np->waiting_list)) np->waiting_list = cmd;
else { else {
while ((wcmd->next_wcmd) != 0) while (wcmd->next_wcmd)
wcmd = (struct scsi_cmnd *) wcmd->next_wcmd; wcmd = (struct scsi_cmnd *) wcmd->next_wcmd;
wcmd->next_wcmd = (char *) cmd; wcmd->next_wcmd = (char *) cmd;
} }
@ -8222,7 +8222,7 @@ static void process_waiting_list(struct ncb *np, int sts)
#ifdef DEBUG_WAITING_LIST #ifdef DEBUG_WAITING_LIST
if (waiting_list) printk("%s: waiting_list=%lx processing sts=%d\n", ncr_name(np), (u_long) waiting_list, sts); if (waiting_list) printk("%s: waiting_list=%lx processing sts=%d\n", ncr_name(np), (u_long) waiting_list, sts);
#endif #endif
while ((wcmd = waiting_list) != 0) { while (wcmd = waiting_list) {
waiting_list = (struct scsi_cmnd *) wcmd->next_wcmd; waiting_list = (struct scsi_cmnd *) wcmd->next_wcmd;
wcmd->next_wcmd = NULL; wcmd->next_wcmd = NULL;
if (sts == DID_OK) { if (sts == DID_OK) {

6
drivers/scsi/sym53c8xx_2/sym_hipd.c
View File

@ -1647,7 +1647,7 @@ static void sym_flush_comp_queue(struct sym_hcb *np, int cam_status)
SYM_QUEHEAD *qp; SYM_QUEHEAD *qp;
struct sym_ccb *cp; struct sym_ccb *cp;
while ((qp = sym_remque_head(&np->comp_ccbq)) != 0) { while ((qp = sym_remque_head(&np->comp_ccbq)) != NULL) {
struct scsi_cmnd *cmd; struct scsi_cmnd *cmd;
cp = sym_que_entry(qp, struct sym_ccb, link_ccbq); cp = sym_que_entry(qp, struct sym_ccb, link_ccbq);
sym_insque_tail(&cp->link_ccbq, &np->busy_ccbq); sym_insque_tail(&cp->link_ccbq, &np->busy_ccbq);
@ -3168,7 +3168,7 @@ int sym_clear_tasks(struct sym_hcb *np, int cam_status, int target, int lun, int
* the COMP queue and put back other ones into * the COMP queue and put back other ones into
* the BUSY queue. * the BUSY queue.
*/ */
while ((qp = sym_remque_head(&qtmp)) != 0) { while ((qp = sym_remque_head(&qtmp)) != NULL) {
struct scsi_cmnd *cmd; struct scsi_cmnd *cmd;
cp = sym_que_entry(qp, struct sym_ccb, link_ccbq); cp = sym_que_entry(qp, struct sym_ccb, link_ccbq);
cmd = cp->cmd; cmd = cp->cmd;
@ -5729,7 +5729,7 @@ void sym_hcb_free(struct sym_hcb *np)
sym_mfree_dma(np->dqueue, sizeof(u32)*(MAX_QUEUE*2), "DQUEUE"); sym_mfree_dma(np->dqueue, sizeof(u32)*(MAX_QUEUE*2), "DQUEUE");
if (np->actccbs) { if (np->actccbs) {
while ((qp = sym_remque_head(&np->free_ccbq)) != 0) { while ((qp = sym_remque_head(&np->free_ccbq)) != NULL) {
cp = sym_que_entry(qp, struct sym_ccb, link_ccbq); cp = sym_que_entry(qp, struct sym_ccb, link_ccbq);
sym_mfree_dma(cp, sizeof(*cp), "CCB"); sym_mfree_dma(cp, sizeof(*cp), "CCB");
} }

4
drivers/scsi/ultrastor.c
View File

@ -951,7 +951,7 @@ static int ultrastor_abort(struct scsi_cmnd *SCpnt)
printk("abort: command mismatch, %p != %p\n", printk("abort: command mismatch, %p != %p\n",
config.mscp[mscp_index].SCint, SCpnt); config.mscp[mscp_index].SCint, SCpnt);
#endif #endif
if (config.mscp[mscp_index].SCint == 0) if (config.mscp[mscp_index].SCint == NULL)
return FAILED; return FAILED;
if (config.mscp[mscp_index].SCint != SCpnt) panic("Bad abort"); if (config.mscp[mscp_index].SCint != SCpnt) panic("Bad abort");
@ -1101,7 +1101,7 @@ static void ultrastor_interrupt(void *dev_id)
SCtmp = mscp->SCint; SCtmp = mscp->SCint;
mscp->SCint = NULL; mscp->SCint = NULL;
if (SCtmp == 0) if (!SCtmp)
{ {
#if ULTRASTOR_DEBUG & (UD_ABORT|UD_INTERRUPT) #if ULTRASTOR_DEBUG & (UD_ABORT|UD_INTERRUPT)
printk("MSCP %d (%x): no command\n", mscp_index, (unsigned int) mscp); printk("MSCP %d (%x): no command\n", mscp_index, (unsigned int) mscp);