From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751475AbbLZKRx (ORCPT ); Sat, 26 Dec 2015 05:17:53 -0500 Received: from mout.web.de ([212.227.17.12]:63281 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750921AbbLZKRt (ORCPT ); Sat, 26 Dec 2015 05:17:49 -0500 Subject: [PATCH 2/3] IDE-ACPI: Delete unnecessary null pointer checks 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: <567E693F.4040909@users.sourceforge.net> Date: Sat, 26 Dec 2015 11:17:35 +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:kh03gjgI4zE+ybvLMv5aj3WJ2ae2p2qrLyaFU+FH3NnlKVAncsF Hryd70Zw71ZSwVMw1lTyCFo9+2knUo1UJRO7RtDILEjx/woEi2nl/1upCJVCt7oHAIW0G60 8PcWrbVw2B8Ua4k7AjbbXBGxZExuN6sL7jjtMDEMTJrBDG7mMKofbGdE1Bon3eIQQ8wuL0E 256hB4Ztgvwx+Xwi7jFjg== X-UI-Out-Filterresults: notjunk:1;V01:K0:oUo1ws2vEsM=:P+tjOzFOgdoEWUbZJ9tqh/ CFGPkG60nbH1Ar2kYbY1VlCiRJstvzTuuO0cdPSH9IO6sF3x8Sf70SYgFgZ7aQ4lyv5lUiTkQ T8soj6yvKTTqhxopJtKIte/pFKGg/no4pswkUsIud8ad+1K+FqH29S3SHThEh3vknqu4bZzNu 50Dgau8i7Mwu5y0mAcevBzNmWO2T/Lru5ilrgq5RmU9vmsKubJGi9zw0StEWP/B6T8SNrbCrT /10GdZ0X7lgZ8DgQQUt/LR+YlAOeFJ4dF/IFqTm4VbLODvgRZq+0Lm5AQuhn8U/lRCWzxf1vP /STuDghXp2WNhHaD/6xfqEmIYIcc4esM1vJSHsDAe0u4K03r7rSy0A0xDVe8/CjkMS7ZUhqrF 6K6J72Le6fp/KuT2s/ARmZVHLFl00CCYYSntujIt4eVfFl7FEbLE8g9o/GTnlgtZpR1jPpRTW l0juFdVYbFoFXyBB4KYnmXLmuVdzocDDutOtU4kIC+GjtWgNngogq5fXcZbh2G2G2SYDgvNtd b+5UPHdchfPYw/JS/gyuTuSyrrte6mOuMRNj6ioEUxS6fS+aK3UIzQLQ9xe4aZfRJJke28eBt obLfaX/5OVEb/ZW6VB5ptwCV7Vq4N/sLABTfpOn/d2DlMh6H+1Clqm31k0+0xvFc/IjBXM59i Jukic/w4emfSSL1AFv4EVxYKZNLLW8daCRgAilDoJsDqkZZJzBTIIKityo9UvUzXiJo1e8I+w 8QTc/ROtKq7rl7L3HiIXyK2YmCyUxoDMP4kISzGBd1B4b4+QZE9w28v24JngBEZOgQ6+i/Ez1 lBrIKZC 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:33:48 +0100 The variable "dinfo" will contain an appropropriate pointer after a call of the acpi_get_object_info() function succeeded. Thus remove two safety checks. Signed-off-by: Markus Elfring --- drivers/ide/ide-acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 319b754..b6b2111 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -148,14 +148,14 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, DEBPRINT("get_object_info for device failed\n"); return -ENODEV; } - if (dinfo && (dinfo->valid & ACPI_VALID_ADR) && + if ((dinfo->valid & ACPI_VALID_ADR) && dinfo->address == addr) { *pcidevfn = addr; *handle = dev_handle; } else { DEBPRINT("get_object_info for device has wrong " " address: %llu, should be %u\n", - dinfo ? (unsigned long long)dinfo->address : -1ULL, + (unsigned long long)dinfo->address, (unsigned int)addr); ret = -ENODEV; goto free_info; -- 2.6.3