From patchwork Thu Mar 18 17:59:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 86781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2II0sAs020249 for ; Thu, 18 Mar 2010 18:00:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753849Ab0CRR7i (ORCPT ); Thu, 18 Mar 2010 13:59:38 -0400 Received: from g4t0017.houston.hp.com ([15.201.24.20]:1810 "EHLO g4t0017.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753749Ab0CRR7h (ORCPT ); Thu, 18 Mar 2010 13:59:37 -0400 Received: from g4t0009.houston.hp.com (g4t0009.houston.hp.com [16.234.32.26]) by g4t0017.houston.hp.com (Postfix) with ESMTP id 5779638304; Thu, 18 Mar 2010 17:59:36 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g4t0009.houston.hp.com (Postfix) with ESMTP id 00FBCC0FB; Thu, 18 Mar 2010 17:59:35 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id E3CC8CF0054; Thu, 18 Mar 2010 11:59:35 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JvKbnPEOF+vV; Thu, 18 Mar 2010 11:59:35 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id CE87ECF000A; Thu, 18 Mar 2010 11:59:35 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id B052C262A0; Thu, 18 Mar 2010 11:59:35 -0600 (MDT) Subject: [PATCH v2 2/4] hpet: pass physical address, not entire hpet_data, to hpet_is_known() To: Clemens Ladisch From: Bjorn Helgaas Cc: Venkatesh Pallipadi , Vojtech Pavlik , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Date: Thu, 18 Mar 2010 11:59:35 -0600 Message-ID: <20100318175935.15143.96345.stgit@bob.kio> In-Reply-To: <20100318175852.15143.2124.stgit@bob.kio> References: <20100318175852.15143.2124.stgit@bob.kio> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 18 Mar 2010 18:00:54 +0000 (UTC) diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 5cb05ed..d132fef 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -662,12 +662,12 @@ static const struct file_operations hpet_fops = { .mmap = hpet_mmap, }; -static int hpet_is_known(struct hpet_data *hdp) +static int hpet_is_known(unsigned long phys_address) { struct hpets *hpetp; for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next) - if (hpetp->hp_hpet_phys == hdp->hd_phys_address) + if (hpetp->hp_hpet_phys == phys_address) return 1; return 0; @@ -788,7 +788,7 @@ int hpet_alloc(struct hpet_data *hdp) * If platform dependent code has allocated the hpet that * ACPI has also reported, then we catch it here. */ - if (hpet_is_known(hdp)) { + if (hpet_is_known(hdp->hd_phys_address)) { printk(KERN_DEBUG "%s: duplicate HPET ignored\n", __func__); return 0; @@ -909,12 +909,7 @@ static int hpet_pnp_add(struct pnp_dev *dev, const struct pnp_device_id *dev_id) memset(&data, 0, sizeof(data)); mem = pnp_get_resource(dev, IORESOURCE_MEM, 0); - if (!mem) - return -ENODEV; - - data.hd_phys_address = mem->start; - - if (hpet_is_known(&data)) + if (!mem || hpet_is_known(mem->start)) return -ENODEV; i = 0; @@ -926,6 +921,7 @@ static int hpet_pnp_add(struct pnp_dev *dev, const struct pnp_device_id *dev_id) if (!data.hd_nirqs) return -ENODEV; + data.hd_phys_address = mem->start; data.hd_address = ioremap(mem->start, resource_size(mem)); return hpet_alloc(&data);