Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e6716e7 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

[PATCH] hpet: hpet driver cleanups 



- Use kzalloc() instead of kmalloc + memset.
- Clean/fix some printk's.
- Use NULL for pointers instead of 0.
- Combine hpet busy searching locations into a function call.

Signed-off-by: default avatarRandy Dunlap <randy_d_dunlap@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b6ab1262

drivers/char/hpet.c

+35 −30
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) 


	if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,

					PAGE_SIZE, vma->vm_page_prot)) {

		printk(KERN_ERR "remap_pfn_range failed in hpet.c\n");

		printk(KERN_ERR "%s: io_remap_pfn_range failed\n",

			__FUNCTION__);

		return -EAGAIN;

	}
@@ -565,6 +566,17 @@ static struct file_operations hpet_fops = { 
	.mmap = hpet_mmap,

};



static int hpet_is_known(struct hpet_data *hdp)

{

	struct hpets *hpetp;



	for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)

		if (hpetp->hp_hpet_phys == hdp->hd_phys_address)

			return 1;



	return 0;

}



EXPORT_SYMBOL(hpet_alloc);

EXPORT_SYMBOL(hpet_register);

EXPORT_SYMBOL(hpet_unregister);
@@ -730,11 +742,10 @@ static void hpet_register_interpolator(struct hpets *hpetp) 
#ifdef	CONFIG_TIME_INTERPOLATION

	struct time_interpolator *ti;



	ti = kmalloc(sizeof(*ti), GFP_KERNEL);

	ti = kzalloc(sizeof(*ti), GFP_KERNEL);

	if (!ti)

		return;



	memset(ti, 0, sizeof(*ti));

	ti->source = TIME_SOURCE_MMIO64;

	ti->shift = 10;

	ti->addr = &hpetp->hp_hpet->hpet_mc;
@@ -799,17 +810,16 @@ int hpet_alloc(struct hpet_data *hdp) 
	struct hpets *hpetp;

	size_t siz;

	struct hpet __iomem *hpet;

	static struct hpets *last = (struct hpets *)0;

	static struct hpets *last = NULL;

	unsigned long period;

	unsigned long long temp;



	/*

	 * hpet_alloc can be called by platform dependent code.

	 * if platform dependent code has allocated the hpet

	 * ACPI also reports hpet, then we catch it here.

	 * If platform dependent code has allocated the hpet that

	 * ACPI has also reported, then we catch it here.

	 */

	for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)

		if (hpetp->hp_hpet_phys == hdp->hd_phys_address) {

	if (hpet_is_known(hdp)) {

		printk(KERN_DEBUG "%s: duplicate HPET ignored\n",

			__FUNCTION__);

		return 0;
@@ -818,13 +828,11 @@ int hpet_alloc(struct hpet_data *hdp) 
	siz = sizeof(struct hpets) + ((hdp->hd_nirqs - 1) *

				      sizeof(struct hpet_dev));



	hpetp = kmalloc(siz, GFP_KERNEL);

	hpetp = kzalloc(siz, GFP_KERNEL);



	if (!hpetp)

		return -ENOMEM;



	memset(hpetp, 0, siz);



	hpetp->hp_which = hpet_nhpet++;

	hpetp->hp_hpet = hdp->hd_address;

	hpetp->hp_hpet_phys = hdp->hd_phys_address;
@@ -911,7 +919,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) 
	struct hpet_data *hdp;

	acpi_status status;

	struct acpi_resource_address64 addr;

	struct hpets *hpetp;



	hdp = data;
@@ -924,8 +931,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) 
		hdp->hd_phys_address = addr.min_address_range;

		hdp->hd_address = ioremap(addr.min_address_range, size);



		for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)

			if (hpetp->hp_hpet_phys == hdp->hd_phys_address) {

		if (hpet_is_known(hdp)) {

			printk(KERN_DEBUG "%s: 0x%lx is busy\n",

				__FUNCTION__, hdp->hd_phys_address);

			iounmap(hdp->hd_address);
@@ -942,8 +948,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) 
		hdp->hd_address = ioremap(fixmem32->range_base_address,

						HPET_RANGE_SIZE);



		for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)

			if (hpetp->hp_hpet_phys == hdp->hd_phys_address) {

		if (hpet_is_known(hdp)) {

			printk(KERN_DEBUG "%s: 0x%lx is busy\n",

				__FUNCTION__, hdp->hd_phys_address);

			iounmap(hdp->hd_address);