From patchwork Thu Feb 5 09:33:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5783021 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 39EBF9F302 for ; Thu, 5 Feb 2015 09:33:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 405C020279 for ; Thu, 5 Feb 2015 09:33:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F38E20253 for ; Thu, 5 Feb 2015 09:33:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755960AbbBEJdm (ORCPT ); Thu, 5 Feb 2015 04:33:42 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:38367 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753268AbbBEJdl (ORCPT ); Thu, 5 Feb 2015 04:33:41 -0500 Received: by pdbft15 with SMTP id ft15so6722843pdb.5 for ; Thu, 05 Feb 2015 01:33:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZfRkemLXmbPlC0CVzugN+2kXkBG5MCeVQRFDG36YuzQ=; b=V6o/82/DJkx/OOo/oN08pU+CT9w5n0wHOT8ozuIx2bMOvDyLW6SbciGQgqOp6wQIYm 4cV6Nxm64pqTBJqkT92w29PswEYTuPZudrm6aGIFyAq4R+e/nTpVgJbfW3RV735b1NAH G5AOau9nuBVUtwdoff6/rW9LZObCQX22ahU4cdKfvg7W3zzntA5mikSa4TXTqDYBpmvR zVzKqo81h5ZDJI38VbaIMr/9MZH+c5ClHBTiQfTPvjxEMQWnxUNxcjXWpEeSudnpeaMB phWAskKrqkpwShhWQ5h8L66B2dpRdZtMvesNqf8NpNLfcohL5EhhbAEBofOeutIIPwBX KLIQ== X-Gm-Message-State: ALoCoQm6btn3wQXdvwMU5W0Xj7b/J5Ux5piHx+l6fG20Cx1YnNnoi3qTiE7gjq9ZGDEhaClajXi1 X-Received: by 10.70.140.6 with SMTP id rc6mr4272133pdb.144.1423128820901; Thu, 05 Feb 2015 01:33:40 -0800 (PST) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id nw6sm4434437pbb.94.2015.02.05.01.33.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Feb 2015 01:33:40 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: Lorenzo Pieralisi , linux-acpi@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo , Tony Luck , Thomas Gleixner Subject: [PATCH] ACPI / table: remove duplicate NULL check for the handler of acpi_table_parse() Date: Thu, 5 Feb 2015 17:33:14 +0800 Message-Id: <1423128794-4680-1-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In acpi_table_parse(), pointer of the table to pass to handler() is checked before handler() called, so remove all the duplicate NULL check in the handler function. CC: Tony Luck CC: Thomas Gleixner Signed-off-by: Hanjun Guo --- arch/ia64/kernel/acpi.c | 6 ------ arch/x86/kernel/acpi/boot.c | 16 ++-------------- drivers/acpi/numa.c | 12 ++---------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index e795cb8..2c44989 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -380,9 +380,6 @@ static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) static int __init acpi_parse_madt(struct acpi_table_header *table) { - if (!table) - return -EINVAL; - acpi_madt = (struct acpi_table_madt *)table; acpi_madt_rev = acpi_madt->header.revision; @@ -645,9 +642,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) struct acpi_table_header *fadt_header; struct acpi_table_fadt *fadt; - if (!table) - return -EINVAL; - fadt_header = (struct acpi_table_header *)table; if (fadt_header->revision != 3) return -ENODEV; /* Only deal with ACPI 2.0 FADT */ diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index b9e30da..14d3652 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -843,13 +843,7 @@ int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base) static int __init acpi_parse_sbf(struct acpi_table_header *table) { - struct acpi_table_boot *sb; - - sb = (struct acpi_table_boot *)table; - if (!sb) { - printk(KERN_WARNING PREFIX "Unable to map SBF\n"); - return -ENODEV; - } + struct acpi_table_boot *sb = (struct acpi_table_boot *)table; sbf_port = sb->cmos_index; /* Save CMOS port */ @@ -863,13 +857,7 @@ static struct resource *hpet_res __initdata; static int __init acpi_parse_hpet(struct acpi_table_header *table) { - struct acpi_table_hpet *hpet_tbl; - - hpet_tbl = (struct acpi_table_hpet *)table; - if (!hpet_tbl) { - printk(KERN_WARNING PREFIX "Unable to map HPET\n"); - return -ENODEV; - } + struct acpi_table_hpet *hpet_tbl = (struct acpi_table_hpet *)table; if (hpet_tbl->address.space_id != ACPI_SPACE_MEM) { printk(KERN_WARNING PREFIX "HPET timers must be located in " diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 24b5476..1333cbdc 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -177,12 +177,7 @@ static int __init slit_valid(struct acpi_table_slit *slit) static int __init acpi_parse_slit(struct acpi_table_header *table) { - struct acpi_table_slit *slit; - - if (!table) - return -EINVAL; - - slit = (struct acpi_table_slit *)table; + struct acpi_table_slit *slit = (struct acpi_table_slit *)table; if (!slit_valid(slit)) { printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n"); @@ -260,11 +255,8 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header, static int __init acpi_parse_srat(struct acpi_table_header *table) { - struct acpi_table_srat *srat; - if (!table) - return -EINVAL; + struct acpi_table_srat *srat = (struct acpi_table_srat *)table; - srat = (struct acpi_table_srat *)table; acpi_srat_revision = srat->header.revision; /* Real work done in acpi_table_parse_srat below. */