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

Commit 16e7730b authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: sp5100_tco: Use request_muxed_region where possible 



Use request_muxed_region for multiplexed IO memory regions.
Also, SP5100_IO_PM_INDEX_REG/SP5100_IO_PM_DATA_REG are only
used during initialization; it is unnecessary to keep the
address range reserved.

Cc: Zoltán Böszörményi <zboszor@pr.hu>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent f541c09e

drivers/watchdog/sp5100_tco.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -379,8 +379,8 @@ static unsigned char sp5100_tco_setupdevice(void) 
	}

	}





	/* Request the IO ports used by this driver */

	/* Request the IO ports used by this driver */

	if (!request_region(SP5100_IO_PM_INDEX_REG, SP5100_PM_IOPORTS_SIZE,

	if (!request_muxed_region(SP5100_IO_PM_INDEX_REG,

			    dev_name)) {

				  SP5100_PM_IOPORTS_SIZE, dev_name)) {

		pr_err("I/O address 0x%04x already in use\n",

		pr_err("I/O address 0x%04x already in use\n",

		       SP5100_IO_PM_INDEX_REG);

		       SP5100_IO_PM_INDEX_REG);

		goto exit;

		goto exit;
@@ -468,6 +468,7 @@ static unsigned char sp5100_tco_setupdevice(void) 
	 */

	 */

	tco_timer_stop();

	tco_timer_stop();





	release_region(SP5100_IO_PM_INDEX_REG, SP5100_PM_IOPORTS_SIZE);

	/* Done */

	/* Done */

	return 1;

	return 1;
@@ -521,7 +522,6 @@ static int sp5100_tco_init(struct platform_device *dev) 
exit:

exit:

	iounmap(tcobase);

	iounmap(tcobase);

	release_mem_region(tcobase_phys, SP5100_WDT_MEM_MAP_SIZE);

	release_mem_region(tcobase_phys, SP5100_WDT_MEM_MAP_SIZE);

	release_region(SP5100_IO_PM_INDEX_REG, SP5100_PM_IOPORTS_SIZE);

	return ret;

	return ret;

}

}
@@ -535,7 +535,6 @@ static void sp5100_tco_cleanup(void) 
	misc_deregister(&sp5100_tco_miscdev);

	misc_deregister(&sp5100_tco_miscdev);

	iounmap(tcobase);

	iounmap(tcobase);

	release_mem_region(tcobase_phys, SP5100_WDT_MEM_MAP_SIZE);

	release_mem_region(tcobase_phys, SP5100_WDT_MEM_MAP_SIZE);

	release_region(SP5100_IO_PM_INDEX_REG, SP5100_PM_IOPORTS_SIZE);

}

}





static int sp5100_tco_remove(struct platform_device *dev)

static int sp5100_tco_remove(struct platform_device *dev)