Commit 7ebe5936 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

cmd640: manage I/O resources in driver 



* Tell IDE layer to not manage resources by setting hwif->mmio flag.

* Use {request,release}_region() for resources management.

* Use driver name for resources management.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d92f1a28

drivers/ide/pci/cmd640.c

+34 −3
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 


#include <asm/io.h>



#define DRV_NAME "cmd640"



/*

 * This flag is set in ide.c by the parameter:  ide0=cmd640_vlb

 */
@@ -686,6 +688,24 @@ static const struct ide_port_info cmd640_port_info __initdata = { 
#endif

};



static int cmd640x_init_one(unsigned long base, unsigned long ctl)

{

	if (!request_region(base, 8, DRV_NAME)) {

		printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",

				DRV_NAME, base, base + 7);

		return -EBUSY;

	}



	if (!request_region(ctl, 1, DRV_NAME)) {

		printk(KERN_ERR "%s: I/O resource 0x%lX not free.\n",

				DRV_NAME, ctl);

		release_region(base, 8);

		return -EBUSY;

	}



	return 0;

}



/*

 * Probe for a cmd640 chipset, and initialize it if found.

 */
@@ -694,7 +714,7 @@ static int __init cmd640x_init(void) 
#ifdef CONFIG_BLK_DEV_CMD640_ENHANCED

	int second_port_toggled = 0;

#endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */

	int second_port_cmd640 = 0;

	int second_port_cmd640 = 0, rc;

	const char *bus_type, *port2;

	unsigned int index;

	u8 b, cfr;
@@ -738,6 +758,17 @@ static int __init cmd640x_init(void) 
		return 0;

	}



	rc = cmd640x_init_one(0x1f0, 0x3f6);

	if (rc)

		return rc;



	rc = cmd640x_init_one(0x170, 0x376);

	if (rc) {

		release_region(0x3f6, 1);

		release_region(0x1f0, 8);

		return rc;

	}



	memset(&hw, 0, sizeof(hw));



	ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
@@ -756,7 +787,7 @@ static int __init cmd640x_init(void) 
	 */

	if (cmd_hwif0) {

		ide_init_port_hw(cmd_hwif0, &hw[0]);



		cmd_hwif0->mmio = 1;

		idx[0] = cmd_hwif0->index;

	}
@@ -809,7 +840,7 @@ static int __init cmd640x_init(void) 
	 */

	if (second_port_cmd640 && cmd_hwif1) {

		ide_init_port_hw(cmd_hwif1, &hw[1]);



		cmd_hwif1->mmio = 1;

		idx[1] = cmd_hwif1->index;

	}

	printk(KERN_INFO "cmd640: %sserialized, secondary interface %s\n",