| Revision | f9ae9de769da115a16ba0ce945dc581d4f24bd81 (tree) |
|---|---|
| Zeit | 2007-08-06 04:51:05 |
| Autor | Willy Tarreau <w@1wt....> |
| Commiter | Willy Tarreau |
[PATCH] module fdomain_cs requires fdomain_setup()
The function which was called was once declared static
and once extern. Also, the arguments were messed up. That
one must not have worked for a long time.
drivers/scsi/fdomain.c (diff) drivers/scsi/pcmcia/fdomain_stub.c (diff)| @@ -561,7 +561,8 @@ static void print_banner( struct Scsi_Host *shpnt ) | ||
| 561 | 561 | printk( "\n" ); |
| 562 | 562 | } |
| 563 | 563 | |
| 564 | -static int __init fdomain_setup( char *str ) | |
| 564 | +/* no __init, may be called from fdomain_stubs.c */ | |
| 565 | +int fdomain_setup( char *str ) | |
| 565 | 566 | { |
| 566 | 567 | int ints[4]; |
| 567 | 568 |
| @@ -85,7 +85,7 @@ typedef struct scsi_info_t { | ||
| 85 | 85 | dev_node_t node[8]; |
| 86 | 86 | } scsi_info_t; |
| 87 | 87 | |
| 88 | -extern void fdomain_setup(char *str, int *ints); | |
| 88 | +extern int fdomain_setup(char *str); | |
| 89 | 89 | |
| 90 | 90 | static void fdomain_release(u_long arg); |
| 91 | 91 | static int fdomain_event(event_t event, int priority, |
| @@ -253,7 +253,7 @@ static void fdomain_config(dev_link_t *link) | ||
| 253 | 253 | ints[1] = link->io.BasePort1; |
| 254 | 254 | ints[2] = link->irq.AssignedIRQ; |
| 255 | 255 | sprintf(str, "%d,%d", link->io.BasePort1, link->irq.AssignedIRQ); |
| 256 | - fdomain_setup(str, ints); | |
| 256 | + fdomain_setup(str); | |
| 257 | 257 | |
| 258 | 258 | scsi_register_module(MODULE_SCSI_HA, &driver_template); |
| 259 | 259 |
Linux Kernel Documents
Fork