The patch titled
hpet: pass physical address, not entire hpet_data, to hpet_is_known()
has been removed from the -mm tree. Its filename was
hpet-pass-physical-address-not-entire-hpet_data-to-hpet_is_known.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hpet: pass physical address, not entire hpet_data, to hpet_is_known()
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
No functional change; hpet_is_known() only needs the physical address, so
supplying that instead of the whole struct hpet_data makes the callers a
little simpler.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Acked-by: Clemens Ladisch <clemens@xxxxxxxxxx>
Cc: Venkatesh Pallipadi <venki@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/hpet.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff -puN drivers/char/hpet.c~hpet-pass-physical-address-not-entire-hpet_data-to-hpet_is_known drivers/char/hpet.c
--- a/drivers/char/hpet.c~hpet-pass-physical-address-not-entire-hpet_data-to-hpet_is_known
+++ a/drivers/char/hpet.c
@@ -700,12 +700,12 @@ static const struct file_operations hpet
.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;
@@ -826,7 +826,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;
@@ -954,12 +954,7 @@ static int hpet_pnp_add(struct pnp_dev *
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;
@@ -971,6 +966,7 @@ static int hpet_pnp_add(struct pnp_dev *
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);
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
linux-next.patch
hpet-pass-physical-address-not-entire-hpet_data-to-hpet_is_known.patch
hpet-clean-up-io-mapping-when-hpet_alloc-fails.patch
maintainers-remove-obsolete-hpet-acpi-entry.patch
ipmi-raise-precedence-of-pnp-based-discovery-mechanisms-acpi-pci.patch
ipmi-convert-tracking-of-the-acpi-device-pointer-to-a-pnp-device.patch
ipmi-update-driver-to-use-dev_printk-and-its-constructs.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
