Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325

Authored by Julia Lawall
Committed by Bartlomiej Zolnierkiewicz
1 parent 3d44cc3e01

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: Julia Lawall <julia@diku.dk>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

drivers/ide/cs5530.c
Diff comments   View file @ 9ecab6e
... ... @@ -81,11 +81,12 @@
81 81 {
82 82 ide_hwif_t *hwif = drive->hwif;
83 83 ide_drive_t *mate = ide_get_pair_dev(drive);
84   - u16 *mateid = mate->id;
  84 + u16 *mateid;
85 85 u8 mask = hwif->ultra_mask;
86 86  
87 87 if (mate == NULL)
88 88 goto out;
  89 + mateid = mate->id;
89 90  
90 91 if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {
91 92 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
drivers/ide/sc1200.c
Diff comments   View file @ 9ecab6e
... ... @@ -104,11 +104,12 @@
104 104 {
105 105 ide_hwif_t *hwif = drive->hwif;
106 106 ide_drive_t *mate = ide_get_pair_dev(drive);
107   - u16 *mateid = mate->id;
  107 + u16 *mateid;
108 108 u8 mask = hwif->ultra_mask;
109 109  
110 110 if (mate == NULL)
111 111 goto out;
  112 + mateid = mate->id;
112 113  
113 114 if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) {
114 115 if ((mateid[ATA_ID_FIELD_VALID] & 4) &&