提交 0983e568 编写于 作者: J Julien Brunel 提交者: Martin Schwidefsky

[S390] drivers/s390: Use an IS_ERR test rather than a NULL test

In case of error, functions dasd_kmalloc_request and idal_buffer_alloc
return an ERR pointer, but never return the NULL pointer. So after a
call to one of these functions, a NULL test should be replaced by an
IS_ERR test.

A simplified version of the semantic patch that makes this change is
as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@correct_null_test@
expression x,E;
statement S1, S2;
@@
x =
(
  dasd_kmalloc_request(...)
|
  idal_buffer_alloc(...)
)
<... when != x = E
if (
(
- x@p2 != NULL
+ ! IS_ERR ( x )
|
- x@p2 == NULL
+ IS_ERR( x )
)
 )
S1
else S2
...>
? x = E;
// </smpl>
Signed-off-by: NJulien Brunel <brunel@diku.dk>
Signed-off-by: NJulia Lawall <julia@diku.dk>
Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
上级 6a55617e
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/err.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/atomic.h> #include <asm/atomic.h>
...@@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device) ...@@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device)
cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */, cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */,
SNSS_DATA_SIZE, device); SNSS_DATA_SIZE, device);
if (!cqr) if (IS_ERR(cqr))
return -ENOMEM; return -ENOMEM;
cqr->startdev = device; cqr->startdev = device;
......
...@@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size) ...@@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size)
/* The current idal buffer is not correct. Allocate a new one. */ /* The current idal buffer is not correct. Allocate a new one. */
new = idal_buffer_alloc(block_size, 0); new = idal_buffer_alloc(block_size, 0);
if (new == NULL) if (IS_ERR(new))
return -ENOMEM; return -ENOMEM;
if (device->char_data.idal_buf != NULL) if (device->char_data.idal_buf != NULL)
......
...@@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count) ...@@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count)
/* Allocate a new idal buffer. */ /* Allocate a new idal buffer. */
new = idal_buffer_alloc(count, 0); new = idal_buffer_alloc(count, 0);
if (new == NULL) if (IS_ERR(new))
return -ENOMEM; return -ENOMEM;
if (device->char_data.idal_buf != NULL) if (device->char_data.idal_buf != NULL)
idal_buffer_free(device->char_data.idal_buf); idal_buffer_free(device->char_data.idal_buf);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册