From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751485AbbLZKU0 (ORCPT ); Sat, 26 Dec 2015 05:20:26 -0500 Received: from mout.web.de ([212.227.15.3]:52863 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750967AbbLZKUY (ORCPT ); Sat, 26 Dec 2015 05:20:24 -0500 Subject: [PATCH 3/3] IDE-ACPI: Move an assignment for one variable in ide_get_dev_handle() To: linux-ide@vger.kernel.org, "David S. Miller" References: <566ABCD9.1060404@users.sourceforge.net> <567E6799.5070802@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <567E69DA.5020409@users.sourceforge.net> Date: Sat, 26 Dec 2015 11:20:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <567E6799.5070802@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:0NJ6EHH/HQh4Ui1PecEyY2fRh+zUdITfUpG5jVX2H9QJ5s/EJl0 cjdggUZ1dt1jmSxhWTGH762MZnNlTQ/ZwpObqMwS8Zf1jD7h1uY6ywfszdofarHxnkExbLn px/3DxQY+ZxM9xPn4Z7m5qoJxiUn+3nIwM+h24idcjh6CpthTd40cXJbYDpuR76cnc+YkNI 5C9+JqGQwA0vWn22XomNA== X-UI-Out-Filterresults: notjunk:1;V01:K0:hY2kuLPPdeY=:8NEbfRj58f7mVG28EktrdZ 7NMWYiy8Vh6R1YT687eDeOhwHOFcoQRt2+7ZKjIc6NS5GHtJ9hNu1FTmMK+j6PmNj1u/vX9i3 DNQ50F8ZXhIx4JoD9Td6I2zI/C9XthY8ynE7cXRAL9Y3p1GaG4XYO1cR0iolSeJ17PfPpwEo6 MFr9TG//6ppO639awY199Gv5BmM7eyVk111bYSNkteGIjNU3t9ADAEBljF+FxszfldRxjwoG1 hPghQECGb9kRiRuJFpocLn+cETAgBY03WCoTQUCVgIYmu87zbwQ5XZEhRfzeLP4Q0MblUmeP8 POcei5lSVuKNfboikwNkoCwptZSQx7oU3tb361zeqLNHCVu5aV9g+QK54pCH/KFariif2QFeT l7qT8zvabB6lsohjwmYHNFJzNJifJaKwU84w4w5+cpjbFEtqjLiOIu6yii9pz0lGYgEBR+0ge fYCTL4BL6ERnemUgBOpgAhlJTsdP40Q8vp8rYli07JCgBEFDe8d0cG+8SAvaiznKyxcT7XzV/ BYyMq7W2wqfC5ZVNKKBob+0s9gUJo0mqgqs9fIjfmcZ5yCk896bcqI+yGiWwbLoIbQY0buqkF aNlSGRQ15RUO3HpiIIFonsNU9NKNruXJUoxsUr3T+xW0xYnMHZCK9gh9QtugZyxLT6G9eobik 0x/Wte7jRZo4YmV8skhcgpJts2UA5NGmOwCOa0KwDA6aaV+b2DFI4JE1dZ0zMLAf/WISTVU6+ LSgcuV4jDYuNt+EQx15kVSrFDVwJGEl4olQvpDfO9EXEbiD5feH/WWrylphyYvDXnOdT+O292 o7wK0RM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 26 Dec 2015 10:50:33 +0100 Move the assignment for the variable "addr" to the statement where its value is used after previous function calls succeeded. Signed-off-by: Markus Elfring --- drivers/ide/ide-acpi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index b6b2111..c2de9f9 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -132,9 +132,6 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, bus = pdev->bus->number; devnum = PCI_SLOT(pdev->devfn); func = PCI_FUNC(pdev->devfn); - /* ACPI _ADR encoding for PCI bus: */ - addr = (u64)(devnum << 16 | func); - DEBPRINT("ENTER: pci %02x:%02x.%01x\n", bus, devnum, func); dev_handle = ACPI_HANDLE(dev); @@ -148,6 +145,8 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, DEBPRINT("get_object_info for device failed\n"); return -ENODEV; } + /* ACPI _ADR encoding for PCI bus: */ + addr = (u64)(devnum << 16 | func); if ((dinfo->valid & ACPI_VALID_ADR) && dinfo->address == addr) { *pcidevfn = addr; -- 2.6.3