Commit 9bcf0910 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds

scsi: fix integer as NULL pointer warning

drivers/scsi/aha152x.c:3585:60: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:3845:56: warning: Using plain integer as NULL pointer
drivers/scsi/qla1280.c:2814:37: warning: Using plain integer as NULL pointer
drivers/scsi/atp870u.c:750:47: warning: Using plain integer as NULL pointer
drivers/scsi/3w-9xxx.c:1281:36: warning: Using plain integer as NULL pointer
drivers/scsi/3w-9xxx.c:1293:36: warning: Using plain integer as NULL pointer
drivers/scsi/3w-9xxx.c:1301:35: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:447:10: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:457:10: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:479:24: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:483:22: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:1213:23: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:1214:23: warning: Using plain integer as NULL pointer
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 94b5e0ac
...@@ -1278,7 +1278,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) ...@@ -1278,7 +1278,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
error = 0; error = 0;
/* Check for command packet errors */ /* Check for command packet errors */
if (full_command_packet->command.newcommand.status != 0) { if (full_command_packet->command.newcommand.status != 0) {
if (tw_dev->srb[request_id] != 0) { if (tw_dev->srb[request_id] != NULL) {
error = twa_fill_sense(tw_dev, request_id, 1, 1); error = twa_fill_sense(tw_dev, request_id, 1, 1);
} else { } else {
/* Skip ioctl error prints */ /* Skip ioctl error prints */
...@@ -1290,7 +1290,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) ...@@ -1290,7 +1290,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
/* Check for correct state */ /* Check for correct state */
if (tw_dev->state[request_id] != TW_S_POSTED) { if (tw_dev->state[request_id] != TW_S_POSTED) {
if (tw_dev->srb[request_id] != 0) { if (tw_dev->srb[request_id] != NULL) {
TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Received a request id that wasn't posted"); TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1a, "Received a request id that wasn't posted");
TW_CLEAR_ALL_INTERRUPTS(tw_dev); TW_CLEAR_ALL_INTERRUPTS(tw_dev);
goto twa_interrupt_bail; goto twa_interrupt_bail;
...@@ -1298,7 +1298,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance) ...@@ -1298,7 +1298,7 @@ static irqreturn_t twa_interrupt(int irq, void *dev_instance)
} }
/* Check for internal command completion */ /* Check for internal command completion */
if (tw_dev->srb[request_id] == 0) { if (tw_dev->srb[request_id] == NULL) {
if (request_id != tw_dev->chrdev_request_id) { if (request_id != tw_dev->chrdev_request_id) {
if (twa_aen_complete(tw_dev, request_id)) if (twa_aen_complete(tw_dev, request_id))
TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1b, "Error completing AEN during attention interrupt"); TW_PRINTK(tw_dev->host, TW_DRIVER, 0x1b, "Error completing AEN during attention interrupt");
......
...@@ -3582,7 +3582,7 @@ static int checksetup(struct aha152x_setup *setup) ...@@ -3582,7 +3582,7 @@ static int checksetup(struct aha152x_setup *setup)
if (i == ARRAY_SIZE(ports)) if (i == ARRAY_SIZE(ports))
return 0; return 0;
if ( request_region(setup->io_port, IO_RANGE, "aha152x")==0 ) { if (!request_region(setup->io_port, IO_RANGE, "aha152x")) {
printk(KERN_ERR "aha152x: io port 0x%x busy.\n", setup->io_port); printk(KERN_ERR "aha152x: io port 0x%x busy.\n", setup->io_port);
return 0; return 0;
} }
...@@ -3842,7 +3842,7 @@ static int __init aha152x_init(void) ...@@ -3842,7 +3842,7 @@ static int __init aha152x_init(void)
if ((setup_count == 1) && (setup[0].io_port == ports[i])) if ((setup_count == 1) && (setup[0].io_port == ports[i]))
continue; continue;
if ( request_region(ports[i], IO_RANGE, "aha152x")==0 ) { if (!request_region(ports[i], IO_RANGE, "aha152x")) {
printk(KERN_ERR "aha152x: io port 0x%x busy.\n", ports[i]); printk(KERN_ERR "aha152x: io port 0x%x busy.\n", ports[i]);
continue; continue;
} }
......
...@@ -747,7 +747,7 @@ static void send_s870(struct atp_unit *dev,unsigned char c) ...@@ -747,7 +747,7 @@ static void send_s870(struct atp_unit *dev,unsigned char c)
dev->quhd[c] = 0; dev->quhd[c] = 0;
} }
workreq = dev->quereq[c][dev->quhd[c]]; workreq = dev->quereq[c][dev->quhd[c]];
if (dev->id[c][scmd_id(workreq)].curr_req == 0) { if (dev->id[c][scmd_id(workreq)].curr_req == NULL) {
dev->id[c][scmd_id(workreq)].curr_req = workreq; dev->id[c][scmd_id(workreq)].curr_req = workreq;
dev->last_cmd[c] = scmd_id(workreq); dev->last_cmd[c] = scmd_id(workreq);
goto cmd_subp; goto cmd_subp;
......
...@@ -444,7 +444,7 @@ static void __iomem *hptiop_map_pci_bar(struct hptiop_hba *hba, int index) ...@@ -444,7 +444,7 @@ static void __iomem *hptiop_map_pci_bar(struct hptiop_hba *hba, int index)
if (!(pci_resource_flags(pcidev, index) & IORESOURCE_MEM)) { if (!(pci_resource_flags(pcidev, index) & IORESOURCE_MEM)) {
printk(KERN_ERR "scsi%d: pci resource invalid\n", printk(KERN_ERR "scsi%d: pci resource invalid\n",
hba->host->host_no); hba->host->host_no);
return 0; return NULL;
} }
mem_base_phy = pci_resource_start(pcidev, index); mem_base_phy = pci_resource_start(pcidev, index);
...@@ -454,7 +454,7 @@ static void __iomem *hptiop_map_pci_bar(struct hptiop_hba *hba, int index) ...@@ -454,7 +454,7 @@ static void __iomem *hptiop_map_pci_bar(struct hptiop_hba *hba, int index)
if (!mem_base_virt) { if (!mem_base_virt) {
printk(KERN_ERR "scsi%d: Fail to ioremap memory space\n", printk(KERN_ERR "scsi%d: Fail to ioremap memory space\n",
hba->host->host_no); hba->host->host_no);
return 0; return NULL;
} }
return mem_base_virt; return mem_base_virt;
} }
...@@ -476,11 +476,11 @@ static void hptiop_unmap_pci_bar_itl(struct hptiop_hba *hba) ...@@ -476,11 +476,11 @@ static void hptiop_unmap_pci_bar_itl(struct hptiop_hba *hba)
static int hptiop_map_pci_bar_mv(struct hptiop_hba *hba) static int hptiop_map_pci_bar_mv(struct hptiop_hba *hba)
{ {
hba->u.mv.regs = hptiop_map_pci_bar(hba, 0); hba->u.mv.regs = hptiop_map_pci_bar(hba, 0);
if (hba->u.mv.regs == 0) if (hba->u.mv.regs == NULL)
return -1; return -1;
hba->u.mv.mu = hptiop_map_pci_bar(hba, 2); hba->u.mv.mu = hptiop_map_pci_bar(hba, 2);
if (hba->u.mv.mu == 0) { if (hba->u.mv.mu == NULL) {
iounmap(hba->u.mv.regs); iounmap(hba->u.mv.regs);
return -1; return -1;
} }
...@@ -1210,8 +1210,8 @@ static void hptiop_remove(struct pci_dev *pcidev) ...@@ -1210,8 +1210,8 @@ static void hptiop_remove(struct pci_dev *pcidev)
static struct hptiop_adapter_ops hptiop_itl_ops = { static struct hptiop_adapter_ops hptiop_itl_ops = {
.iop_wait_ready = iop_wait_ready_itl, .iop_wait_ready = iop_wait_ready_itl,
.internal_memalloc = 0, .internal_memalloc = NULL,
.internal_memfree = 0, .internal_memfree = NULL,
.map_pci_bar = hptiop_map_pci_bar_itl, .map_pci_bar = hptiop_map_pci_bar_itl,
.unmap_pci_bar = hptiop_unmap_pci_bar_itl, .unmap_pci_bar = hptiop_unmap_pci_bar_itl,
.enable_intr = hptiop_enable_intr_itl, .enable_intr = hptiop_enable_intr_itl,
......
...@@ -2811,7 +2811,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp) ...@@ -2811,7 +2811,7 @@ qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
/* Check for room in outstanding command list. */ /* Check for room in outstanding command list. */
for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS && for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS &&
ha->outstanding_cmds[cnt] != 0; cnt++); ha->outstanding_cmds[cnt] != NULL; cnt++);
if (cnt >= MAX_OUTSTANDING_COMMANDS) { if (cnt >= MAX_OUTSTANDING_COMMANDS) {
status = 1; status = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment