Update of /cvsroot/gc-linux/linux/drivers/exi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32317/drivers/exi
Modified Files:
exi-driver.c exi-hw.c exi-hw.h
Log Message:
The caller of exi_hw_init can now set the name used for registrations.
Warn on deselects if the channel is not selected.
Index: exi-driver.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-driver.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exi-driver.c 15 Mar 2005 23:39:00 -0000 1.8
+++ exi-driver.c 20 Mar 2005 17:10:38 -0000 1.9
@@ -349,7 +349,7 @@
extern unsigned long exi_running;
if (!test_and_set_bit(1, &exi_running)) {
- retval = exi_hw_init();
+ retval = exi_hw_init(DRV_MODULE_NAME);
if (retval)
goto err_hw_init;
}
Index: exi-hw.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-hw.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exi-hw.c 17 Mar 2005 21:02:15 -0000 1.7
+++ exi-hw.c 20 Mar 2005 17:10:38 -0000 1.8
@@ -435,6 +435,8 @@
{
struct exi_channel *exi_channel = cmd->exi_channel;
+ WARN_ON(!exi_is_selected(exi_channel));
+
DBG("channel=%d\n", exi_channel->channel);
exi_deselect_raw(exi_channel);
@@ -1086,7 +1088,7 @@
/*
* Pseudo-Internal. Initialize basic channel structures and hardware.
*/
-int exi_hw_init(void)
+int exi_hw_init(char *module_name)
{
struct exi_channel *exi_channel;
int channel;
@@ -1103,7 +1105,7 @@
exi_quiesce_all_channels(EXI_CSR_EXTINMASK);
/* register the exi interrupt handler */
- retval = request_irq(EXI_IRQ, exi_irq_handler, 0, "exi", NULL);
+ retval = request_irq(EXI_IRQ, exi_irq_handler, 0, module_name, NULL);
if (retval) {
exi_printk(KERN_ERR, "unable to register irq%d\n", EXI_IRQ);
}
Index: exi-hw.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-hw.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exi-hw.h 15 Mar 2005 23:39:01 -0000 1.3
+++ exi-hw.h 20 Mar 2005 17:10:38 -0000 1.4
@@ -118,7 +118,7 @@
struct exi_event_handler events[EXI_MAX_EVENTS];
};
-extern int exi_hw_init(void);
+extern int exi_hw_init(char *);
extern void exi_hw_exit(void);
#define exi_is_selected(x) ((x)->flags & EXI_SELECTED)
|
