Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1735917

[PATCH 4/5] [media] s2255drv: Use common error handling code in read_pipe_completion()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 20 Sep 2017 17:45:13 +0200

Add a jump target so that a bit of exception handling can be better
reused at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/media/usb/s2255/s2255drv.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 29bc73ad7d8a..5a5d5ae833ff 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -2065,11 +2065,9 @@ static void read_pipe_completion(struct urb *purb)
 	pipe_info = purb->context;
-	if (!pipe_info) {
-		dev_err(&purb->dev->dev, "no context!\n");
-		return;
-	}
+	if (!pipe_info)
+		goto report_failure;
+
 	dev = pipe_info->dev;
-	if (!dev) {
-		dev_err(&purb->dev->dev, "no context!\n");
-		return;
-	}
+	if (!dev)
+		goto report_failure;
+
 	status = purb->status;
@@ -2107,6 +2105,9 @@ static void read_pipe_completion(struct urb *purb)
 		dprintk(dev, 2, "%s :complete state 0\n", __func__);
 	}
 	return;
+
+report_failure:
+	dev_err(&purb->dev->dev, "no context!\n");
 }
 
 static int s2255_start_readpipe(struct s2255_dev *dev)
-- 
2.14.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] [media] s2255drv: Fine-tuning for some function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-20 19:00 +0200
  [PATCH 2/5] [media] s2255drv: Adjust 13 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-20 19:00 +0200
    Re: [PATCH 2/5] [media] s2255drv: Adjust 13 checks for null pointers Dan Carpenter <dan.carpenter@oracle.com> - 2017-09-21 01:10 +0200
      Re: [media] s2255drv: Adjust 13 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-21 10:20 +0200
        Re: [media] s2255drv: Adjust 13 checks for null pointers Dan Carpenter <dan.carpenter@oracle.com> - 2017-09-21 11:30 +0200
          Re: [media] s2255drv: Adjust 13 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-21 13:30 +0200
  [PATCH 1/5] [media] s2255drv: Delete three error messages for a  failed memory allocation in s2255_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-20 19:00 +0200
  [PATCH 4/5] [media] s2255drv: Use common error handling code in  read_pipe_completion() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-20 19:10 +0200
  [PATCH 3/5] [media] s2255drv: Improve two size determinations in  s2255_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-20 19:10 +0200
  [PATCH 5/5] [media] s2255drv: Delete an unnecessary return statement  in five functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-09-20 19:10 +0200

csiph-web