From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754929AbbHJQ45 (ORCPT ); Mon, 10 Aug 2015 12:56:57 -0400 Received: from mga14.intel.com ([192.55.52.115]:51147 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753820AbbHJQ4w (ORCPT ); Mon, 10 Aug 2015 12:56:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,647,1432623600"; d="scan'208";a="539228411" From: Andy Shevchenko To: "Rafael J . Wysocki" , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 3/3] device property: attach 'else if' to the proper 'if' Date: Mon, 10 Aug 2015 19:56:48 +0300 Message-Id: <1439225808-132916-3-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439225808-132916-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1439225808-132916-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Obviously in the current place the 'else' keyword is redundant, though it seems quite correct when we check if nval is in allowed range. Reattach the condition branch there. Signed-off-by: Andy Shevchenko --- drivers/acpi/property.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 7836e2e..a28752c 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -528,13 +528,14 @@ int acpi_dev_prop_read(struct acpi_device *adev, const char *propname, if (!val) return obj->package.count; - else if (nval <= 0) - return -EINVAL; if (nval > obj->package.count) return -EOVERFLOW; + else if (nval <= 0) + return -EINVAL; items = obj->package.elements; + switch (proptype) { case DEV_PROP_U8: ret = acpi_copy_property_array_u8(items, (u8 *)val, nval); @@ -552,8 +553,7 @@ int acpi_dev_prop_read(struct acpi_device *adev, const char *propname, ret = acpi_copy_property_array_string(items, (char **)val, nval); break; default: - ret = -EINVAL; - break; + return -EINVAL; } return ret; } -- 2.5.0