Signed-off-by: Thomas Meyer <[email protected]> --- diff -u -p a/block/blk-core.c b/block/blk-core.c --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1626,7 +1626,7 @@ static int __init fail_make_request_debu struct dentry *dir = fault_create_debugfs_attr("fail_make_request", NULL, &fail_make_request); - return IS_ERR(dir) ? PTR_ERR(dir) : 0; + return PTR_RET(dir); } late_initcall(fail_make_request_debugfs); diff -u -p a/block/blk-timeout.c b/block/blk-timeout.c --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -31,7 +31,7 @@ static int __init fail_io_timeout_debugf struct dentry *dir = fault_create_debugfs_attr("fail_io_timeout", NULL, &fail_io_timeout); - return IS_ERR(dir) ? PTR_ERR(dir) : 0; + return PTR_RET(dir); } late_initcall(fail_io_timeout_debugfs); diff -u -p a/block/ioctl.c b/block/ioctl.c --- a/block/ioctl.c +++ b/block/ioctl.c @@ -64,7 +64,7 @@ static int blkpg_ioctl(struct block_devi part = add_partition(disk, partno, start, length, ADDPART_FLAG_NONE, NULL); mutex_unlock(&bdev->bd_mutex); - return IS_ERR(part) ? PTR_ERR(part) : 0; + return PTR_RET(part); case BLKPG_DEL_PARTITION: part = disk_get_part(disk, partno); if (!part)
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
