diff options
| author | Ken Cox <jkc@redhat.com> | 2014-03-19 13:06:25 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 13:56:31 -0700 |
| commit | 22ad57ba5eacf2611a086379aaa18e456bf2ffbc (patch) | |
| tree | 839e3be8de9fc5a7192b3a063d68bc42d1cbdc5f /drivers/staging/unisys/visorchannel | |
| parent | 5e54c97dab0298cf5479bc1f2d3f42ef5605ce6e (diff) | |
Staging: unisys: Remove RETINT macro
The RETINT macro included a goto statement which is not allowed in the
kernel.
Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorchannel')
| -rw-r--r-- | drivers/staging/unisys/visorchannel/visorchannel_funcs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c index 8a200af3f0c8..053681616ba3 100644 --- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c +++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c @@ -250,7 +250,7 @@ visorchannel_clear(VISORCHANNEL *channel, ulong offset, U8 ch, ulong nbytes) if (buf == NULL) { ERRDRV("%s failed memory allocation", __func__); - RETINT(-1); + goto Away; } memset(buf, ch, bufsize); while (nbytes > 0) { @@ -260,12 +260,14 @@ visorchannel_clear(VISORCHANNEL *channel, ulong offset, U8 ch, ulong nbytes) thisbytes = nbytes; x = visor_memregion_write(channel->memregion, offset + written, buf, thisbytes); - if (x < 0) - RETINT(x); + if (x < 0) { + rc = x; + goto Away; + } written += thisbytes; nbytes -= thisbytes; } - RETINT(0); + rc = 0; Away: if (buf != NULL) { |