All of lore.kernel.org
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: platform-driver-x86@vger.kernel.org,
	Andy Shevchenko <andy@infradead.org>,
	Darren Hart <dvhart@infradead.org>,
	Mattia Dongili <malattia@linux.it>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] Sony-laptop: Use common error handling code in sony_nc_setup_rfkill()
Date: Mon, 30 Oct 2017 21:15:21 +0100	[thread overview]
Message-ID: <f33d9aa0-1a8e-f702-7513-5c0d5b464529@users.sourceforge.net> (raw)

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 30 Oct 2017 21:10:49 +0100

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

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/platform/x86/sony-laptop.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a16cea2be9c3..3ab6e41a8ed6 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1660,18 +1660,16 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
 	if (!rfk)
 		return -ENOMEM;
 
-	if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) {
-		rfkill_destroy(rfk);
-		return -1;
-	}
+	if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0)
+		goto destroy_rfk;
+
 	hwblock = !(result & 0x1);
 
 	if (sony_call_snc_handle(sony_rfkill_handle,
-				sony_rfkill_address[nc_type],
-				&result) < 0) {
-		rfkill_destroy(rfk);
-		return -1;
-	}
+				 sony_rfkill_address[nc_type],
+				 &result) < 0)
+		goto destroy_rfk;
+
 	swblock = !(result & 0x2);
 
 	rfkill_init_sw_state(rfk, swblock);
@@ -1684,6 +1682,10 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
 	}
 	sony_rfkill_devices[nc_type] = rfk;
 	return err;
+
+destroy_rfk:
+	rfkill_destroy(rfk);
+	return -1;
 }
 
 static void sony_nc_rfkill_update(void)
-- 
2.14.3

WARNING: multiple messages have this Message-ID (diff)
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: platform-driver-x86@vger.kernel.org,
	Andy Shevchenko <andy@infradead.org>,
	Darren Hart <dvhart@infradead.org>,
	Mattia Dongili <malattia@linux.it>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] Sony-laptop: Use common error handling code in sony_nc_setup_rfkill()
Date: Mon, 30 Oct 2017 20:15:21 +0000	[thread overview]
Message-ID: <f33d9aa0-1a8e-f702-7513-5c0d5b464529@users.sourceforge.net> (raw)

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 30 Oct 2017 21:10:49 +0100

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

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/platform/x86/sony-laptop.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a16cea2be9c3..3ab6e41a8ed6 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1660,18 +1660,16 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
 	if (!rfk)
 		return -ENOMEM;
 
-	if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) {
-		rfkill_destroy(rfk);
-		return -1;
-	}
+	if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0)
+		goto destroy_rfk;
+
 	hwblock = !(result & 0x1);
 
 	if (sony_call_snc_handle(sony_rfkill_handle,
-				sony_rfkill_address[nc_type],
-				&result) < 0) {
-		rfkill_destroy(rfk);
-		return -1;
-	}
+				 sony_rfkill_address[nc_type],
+				 &result) < 0)
+		goto destroy_rfk;
+
 	swblock = !(result & 0x2);
 
 	rfkill_init_sw_state(rfk, swblock);
@@ -1684,6 +1682,10 @@ static int sony_nc_setup_rfkill(struct acpi_device *device,
 	}
 	sony_rfkill_devices[nc_type] = rfk;
 	return err;
+
+destroy_rfk:
+	rfkill_destroy(rfk);
+	return -1;
 }
 
 static void sony_nc_rfkill_update(void)
-- 
2.14.3


             reply	other threads:[~2017-10-30 20:16 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-30 20:15 SF Markus Elfring [this message]
2017-10-30 20:15 ` [PATCH] Sony-laptop: Use common error handling code in sony_nc_setup_rfkill() SF Markus Elfring
2017-10-31 13:33 ` Andy Shevchenko
2017-10-31 13:33   ` Andy Shevchenko
2017-10-31 14:24   ` SF Markus Elfring
2017-10-31 14:24     ` SF Markus Elfring
2017-10-31 16:35     ` Andy Shevchenko
2017-10-31 16:35       ` Andy Shevchenko
2017-10-31 16:56       ` SF Markus Elfring
2017-10-31 16:56         ` SF Markus Elfring
2017-11-01 18:45   ` [PATCH v2 0/3] Sony-laptop: Adjustments for sony_nc_setup_rfkill() SF Markus Elfring
2017-11-01 18:45     ` SF Markus Elfring
2017-11-01 18:46     ` [PATCH v2 1/3] Sony-laptop: Fix exception handling in sony_nc_setup_rfkill() SF Markus Elfring
2017-11-01 18:46       ` SF Markus Elfring
2017-11-03 12:00       ` Andy Shevchenko
2017-11-03 12:00         ` Andy Shevchenko
2017-11-01 18:47     ` [PATCH v2 2/3] Sony-laptop: Delete an unnecessary variable initialisation " SF Markus Elfring
2017-11-01 18:47       ` SF Markus Elfring
2017-11-03 12:00       ` Andy Shevchenko
2017-11-03 12:00         ` [PATCH v2 2/3] Sony-laptop: Delete an unnecessary variable initialisation in sony_nc_setup_rfkil Andy Shevchenko
2017-11-01 18:49     ` [PATCH v2 3/3] Sony-laptop: Use common error handling code in sony_nc_setup_rfkill() SF Markus Elfring
2017-11-01 18:49       ` SF Markus Elfring
2017-11-03 12:02     ` [PATCH v2 0/3] Sony-laptop: Adjustments for sony_nc_setup_rfkill() Andy Shevchenko
2017-11-03 12:02       ` Andy Shevchenko
2017-11-03 13:23       ` SF Markus Elfring
2017-11-03 13:23         ` SF Markus Elfring
2017-11-05 13:24         ` Andy Shevchenko
2017-11-05 13:24           ` Andy Shevchenko
2017-11-05 14:20           ` SF Markus Elfring
2017-11-05 14:20             ` SF Markus Elfring
2017-11-07 12:49             ` Andy Shevchenko
2017-11-07 12:49               ` Andy Shevchenko
2017-11-07 13:00               ` SF Markus Elfring
2017-11-07 13:00                 ` SF Markus Elfring
2017-11-07 13:18                 ` Andy Shevchenko
2017-11-07 13:18                   ` Andy Shevchenko
2017-11-07 13:54                   ` SF Markus Elfring
2017-11-07 13:54                     ` SF Markus Elfring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f33d9aa0-1a8e-f702-7513-5c0d5b464529@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=andy@infradead.org \
    --cc=dvhart@infradead.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=malattia@linux.it \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.