diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-26 02:27:48 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-01-02 13:11:15 -0500 |
commit | c31558efcc45651d3e324ea861ee5934cafef8e2 (patch) | |
tree | 69b070f98829066f1c0c493172fe616a914162c9 /drivers/message/fusion | |
parent | ddccf307a3599e452804e228d8ed30fba578923e (diff) |
[SCSI] fusion: Move a dereference below a NULL test
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>
@disable is_null@
identifier f;
expression E;
identifier fld;
statement S;
@@
+ if (E == NULL) S
f(...,E->fld,...);
- if (E == NULL) S
@@
identifier f;
expression E;
identifier fld;
statement S;
@@
+ if (!E) S
f(...,E->fld,...);
- if (!E) S
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: "Prakash, Sathya" <Sathya.Prakash@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/message/fusion')
-rw-r--r-- | drivers/message/fusion/mptctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index b89f476cd0a..c63817117c0 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
@@ -308,10 +308,11 @@ static void mptctl_timeout_expired (MPT_IOCTL *ioctl) | |||
308 | { | 308 | { |
309 | int rc = 1; | 309 | int rc = 1; |
310 | 310 | ||
311 | dctlprintk(ioctl->ioc, printk(MYIOC_s_DEBUG_FMT ": Timeout Expired! Host %d\n", | ||
312 | ioctl->ioc->name, ioctl->ioc->id)); | ||
313 | if (ioctl == NULL) | 311 | if (ioctl == NULL) |
314 | return; | 312 | return; |
313 | dctlprintk(ioctl->ioc, | ||
314 | printk(MYIOC_s_DEBUG_FMT ": Timeout Expired! Host %d\n", | ||
315 | ioctl->ioc->name, ioctl->ioc->id)); | ||
315 | 316 | ||
316 | ioctl->wait_done = 0; | 317 | ioctl->wait_done = 0; |
317 | if (ioctl->reset & MPTCTL_RESET_OK) | 318 | if (ioctl->reset & MPTCTL_RESET_OK) |