Skip to content

Commit

Permalink
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
Browse files Browse the repository at this point in the history
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: Julia Lawall <julia@diku.dk>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Julia Lawall authored and Bartlomiej Zolnierkiewicz committed Dec 22, 2008
1 parent 3d44cc3 commit 9ecab6e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion drivers/ide/cs5530.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down
3 changes: 2 additions & 1 deletion drivers/ide/sc1200.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down

0 comments on commit 9ecab6e

Please sign in to comment.