diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-22 17:05:06 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-12-22 17:05:06 -0500 |
commit | 9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325 (patch) | |
tree | bcf788b943c0050b06a30f69a940ae31fd69c6bf /drivers/ide | |
parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) |
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/cs5530.c | 3 | ||||
-rw-r--r-- | drivers/ide/sc1200.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c index 53f079cc00a..d8ede85fe17 100644 --- a/drivers/ide/cs5530.c +++ b/drivers/ide/cs5530.c | |||
@@ -81,11 +81,12 @@ static u8 cs5530_udma_filter(ide_drive_t *drive) | |||
81 | { | 81 | { |
82 | ide_hwif_t *hwif = drive->hwif; | 82 | ide_hwif_t *hwif = drive->hwif; |
83 | ide_drive_t *mate = ide_get_pair_dev(drive); | 83 | ide_drive_t *mate = ide_get_pair_dev(drive); |
84 | u16 *mateid = mate->id; | 84 | u16 *mateid; |
85 | u8 mask = hwif->ultra_mask; | 85 | u8 mask = hwif->ultra_mask; |
86 | 86 | ||
87 | if (mate == NULL) | 87 | if (mate == NULL) |
88 | goto out; | 88 | goto out; |
89 | mateid = mate->id; | ||
89 | 90 | ||
90 | if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { | 91 | if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { |
91 | if ((mateid[ATA_ID_FIELD_VALID] & 4) && | 92 | if ((mateid[ATA_ID_FIELD_VALID] & 4) && |
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c index f1a8758e3a9..ec7f766ef5e 100644 --- a/drivers/ide/sc1200.c +++ b/drivers/ide/sc1200.c | |||
@@ -104,11 +104,12 @@ static u8 sc1200_udma_filter(ide_drive_t *drive) | |||
104 | { | 104 | { |
105 | ide_hwif_t *hwif = drive->hwif; | 105 | ide_hwif_t *hwif = drive->hwif; |
106 | ide_drive_t *mate = ide_get_pair_dev(drive); | 106 | ide_drive_t *mate = ide_get_pair_dev(drive); |
107 | u16 *mateid = mate->id; | 107 | u16 *mateid; |
108 | u8 mask = hwif->ultra_mask; | 108 | u8 mask = hwif->ultra_mask; |
109 | 109 | ||
110 | if (mate == NULL) | 110 | if (mate == NULL) |
111 | goto out; | 111 | goto out; |
112 | mateid = mate->id; | ||
112 | 113 | ||
113 | if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { | 114 | if (ata_id_has_dma(mateid) && __ide_dma_bad_drive(mate) == 0) { |
114 | if ((mateid[ATA_ID_FIELD_VALID] & 4) && | 115 | if ((mateid[ATA_ID_FIELD_VALID] & 4) && |