Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c9abde12d6debe5b97f36fb43cf188c1b9cd477f

Authored by Bartlomiej Zolnierkiewicz
Committed by Jeff Garzik
1 parent 705d201414
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

libata: remove superfluous NULL pointer checks 

host->ports[] always contain pointers to valid port structures since
a "dummy port" structure is used in case if there is no physical port.

This patch takes care of two entries from Dan's list:

drivers/ata/sata_sil.c +535 sil_interrupt(13) warning: variable derefenced before check 'ap'
drivers/ata/sata_mv.c +2517 mv_unexpected_intr(6) warning: variable derefenced before check 'ap'

and of another needless NULL pointer check in pata_octeon_cf.c.

Reported-by: Dan Carpenter <error27@gmail.com>
Cc: corbet@lwn.net
Cc: eteo@redhat.com
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

Showing 3 changed files with 4 additions and 3 deletions Side-by-side Diff

drivers/ata/pata_octeon_cf.c
Diff comments   View file @ c9abde1
... ... @@ -653,7 +653,8 @@
653 653  
654 654 ap = host->ports[i];
655 655 ocd = ap->dev->platform_data;
656   - if (!ap || (ap->flags & ATA_FLAG_DISABLED))
  656 +
  657 + if (ap->flags & ATA_FLAG_DISABLED)
657 658 continue;
658 659  
659 660 ocd = ap->dev->platform_data;
drivers/ata/sata_mv.c
Diff comments   View file @ c9abde1
... ... @@ -2514,7 +2514,7 @@
2514 2514 char *when = "idle";
2515 2515  
2516 2516 ata_ehi_clear_desc(ehi);
2517   - if (!ap || (ap->flags & ATA_FLAG_DISABLED)) {
  2517 + if (ap->flags & ATA_FLAG_DISABLED) {
2518 2518 when = "disabled";
2519 2519 } else if (edma_was_enabled) {
2520 2520 when = "EDMA enabled";
drivers/ata/sata_sil.c
Diff comments   View file @ c9abde1
... ... @@ -532,7 +532,7 @@
532 532 struct ata_port *ap = host->ports[i];
533 533 u32 bmdma2 = readl(mmio_base + sil_port[ap->port_no].bmdma2);
534 534  
535   - if (unlikely(!ap || ap->flags & ATA_FLAG_DISABLED))
  535 + if (unlikely(ap->flags & ATA_FLAG_DISABLED))
536 536 continue;
537 537  
538 538 /* turn off SATA_IRQ if not supported */