From patchwork Mon May 11 04:17:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 6372991 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AE3B7BEEE1 for ; Mon, 11 May 2015 04:19:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC0B120340 for ; Mon, 11 May 2015 04:19:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7853202F0 for ; Mon, 11 May 2015 04:19:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752558AbbEKET1 (ORCPT ); Mon, 11 May 2015 00:19:27 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:36573 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264AbbEKESW (ORCPT ); Mon, 11 May 2015 00:18:22 -0400 Received: by pdea3 with SMTP id a3so138048167pde.3 for ; Sun, 10 May 2015 21:18:20 -0700 (PDT) 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:in-reply-to :references; bh=5vkCyGFn8h/PRKBqUo9ZaM+EPJa8MehuHcyWiO5qsr0=; b=C4cO11Va6KIbGUmclUpBa0kRvTNDHKzLx6BI8YszRW5uu4QTobbxNeGPHnF32F7883 xJJFkssPrToN0bRZu3DDhEf5XdGvr/8Ni/SrF8y3SUoo+UyL7+p3FE19VFjh0pQZFHv2 T/yPWFEbnE4gWiweKQ87e/vs9Of44SVO0w28DblD5ZBA8fsV/UxNT0+TYD80TqK+jg+l 9lKmO42nTPc/OjSyUgWQo3iavONdEe+e/JtItQjHSLTbsA30Z+u66jgdmHAtX7ZKgo5H 4mAbqTNZtYZxNoTNEiCNMLGjvgFzCTXDhwjp6BlSeCWpXFkWs4HHbGPeFr/9shmKZlus pSlQ== X-Gm-Message-State: ALoCoQmeYGqhC633YBvsu/WSnaqIZ5yNbtpLdRZlPw2ogLT8Ao0YidElI7rOIdPc76Xf/FO8mhXR X-Received: by 10.70.47.138 with SMTP id d10mr15736172pdn.137.1431317900831; Sun, 10 May 2015 21:18:20 -0700 (PDT) Received: from localhost ([180.150.153.56]) by mx.google.com with ESMTPSA id qy2sm11541562pab.5.2015.05.10.21.18.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 10 May 2015 21:18:20 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org Cc: Will Deacon , Catalin Marinas , Boris Ostrovsky , Stefano Stabellini , Lorenzo Pieralisi , Sudeep Holla , Konrad Rzeszutek Wilk , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH v3 4/7] ACPI / processor: remove cpu_index in acpi_processor_get_info() Date: Mon, 11 May 2015 12:17:16 +0800 Message-Id: <1431317839-4584-5-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431317839-4584-1-git-send-email-hanjun.guo@linaro.org> References: <1431317839-4584-1-git-send-email-hanjun.guo@linaro.org> 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 Just use pr->id instead of cpu_index to simplify the code. Signed-off-by: Hanjun Guo --- drivers/acpi/acpi_processor.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index ac6bda0..0676b50 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -216,7 +216,7 @@ static int acpi_processor_get_info(struct acpi_device *device) struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; struct acpi_processor *pr = acpi_driver_data(device); phys_cpuid_t phys_id; - int cpu_index, device_declaration = 0; + int device_declaration = 0; acpi_status status = AE_OK; static int cpu0_initialized; unsigned long long value; @@ -268,18 +268,16 @@ static int acpi_processor_get_info(struct acpi_device *device) acpi_handle_debug(pr->handle, "failed to get CPU physical ID.\n"); pr->phys_id = phys_id; - cpu_index = acpi_map_cpuid(pr->phys_id, pr->acpi_id); + pr->id = acpi_map_cpuid(pr->phys_id, pr->acpi_id); if (!cpu0_initialized && !acpi_has_cpu_in_madt()) { cpu0_initialized = 1; /* * Handle UP system running SMP kernel, with no CPU * entry in MADT */ - if (invalid_logical_cpuid(cpu_index) - && (num_online_cpus() == 1)) - cpu_index = 0; + if (invalid_logical_cpuid(pr->id) && (num_online_cpus() == 1)) + pr->id = 0; } - pr->id = cpu_index; /* * Extra Processor objects may be enumerated on MP systems with