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

Commit 9ecab6e5 authored by Julia Lawall's avatar Julia Lawall Committed by Bartlomiej Zolnierkiewicz
Browse files

drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test 

In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@

- T i = E->fld;
+ T i;
  ... when != E
      when != i
  if (E == NULL) S
+ i = E->fld;
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 3d44cc3e

drivers/ide/cs5530.c

+2 −1
Original line number Diff line number Diff line
@@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive) 
{

	ide_hwif_t *hwif = drive->hwif;

	ide_drive_t *mate = ide_get_pair_dev(drive);

	u16 *mateid = mate->id;

	u16 *mateid;

	u8 mask = hwif->ultra_mask;



	if (mate == NULL)

		goto out;

	mateid = mate->id;



	if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {

		if ((mateid[ATA_ID_FIELD_VALID] & 4) &&

drivers/ide/sc1200.c

+2 −1
Original line number Diff line number Diff line
@@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive) 
{

	ide_hwif_t *hwif = drive->hwif;

	ide_drive_t *mate = ide_get_pair_dev(drive);

	u16 *mateid = mate->id;

	u16 *mateid;

	u8 mask = hwif->ultra_mask;



	if (mate == NULL)

		goto out;

	mateid = mate->id;



	if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {

		if ((mateid[ATA_ID_FIELD_VALID] & 4) &&