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

Commit c9abde12 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

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: default avatarDan Carpenter <error27@gmail.com>
Cc: corbet@lwn.net
Cc: eteo@redhat.com
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 705d2014

drivers/ata/pata_octeon_cf.c

+2 −1
Original line number Diff line number Diff line
@@ -653,7 +653,8 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance) 


		ap = host->ports[i];

		ocd = ap->dev->platform_data;

		if (!ap || (ap->flags & ATA_FLAG_DISABLED))



		if (ap->flags & ATA_FLAG_DISABLED)

			continue;



		ocd = ap->dev->platform_data;

drivers/ata/sata_mv.c

+1 −1
Original line number Diff line number Diff line
@@ -2514,7 +2514,7 @@ static void mv_unexpected_intr(struct ata_port *ap, int edma_was_enabled) 
	char *when = "idle";



	ata_ehi_clear_desc(ehi);

	if (!ap || (ap->flags & ATA_FLAG_DISABLED)) {

	if (ap->flags & ATA_FLAG_DISABLED) {

		when = "disabled";

	} else if (edma_was_enabled) {

		when = "EDMA enabled";

drivers/ata/sata_sil.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static irqreturn_t sil_interrupt(int irq, void *dev_instance) 
		struct ata_port *ap = host->ports[i];

		u32 bmdma2 = readl(mmio_base + sil_port[ap->port_no].bmdma2);



		if (unlikely(!ap || ap->flags & ATA_FLAG_DISABLED))

		if (unlikely(ap->flags & ATA_FLAG_DISABLED))

			continue;



		/* turn off SATA_IRQ if not supported */