diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-06 16:46:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-06 16:46:40 -0700 |
| commit | 07342d623b8e1ac9501a36a0da55cbce1117aeaf (patch) | |
| tree | 611ac9c9a042ad5a5af247567091db9808ceb5ca /drivers/scsi/qla2xxx | |
| parent | d4a1a7322c8c6b9899851f8358eb3842c67de6bc (diff) | |
| parent | e4862fedbc37a2c242824b100101f8e6e8488748 (diff) | |
Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 8 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_gbl.h | 4 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 2240a0cde58..9bc1f153f7e 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -300,7 +300,7 @@ qla2x00_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout) rport->dev_loss_tmo = ha->port_down_retry_count + 5; } -static struct fc_function_template qla2xxx_transport_functions = { +struct fc_function_template qla2xxx_transport_functions = { .show_host_node_name = 1, .show_host_port_name = 1, @@ -322,12 +322,6 @@ static struct fc_function_template qla2xxx_transport_functions = { }; -struct scsi_transport_template * -qla2x00_alloc_transport_tmpl(void) -{ - return (fc_attach_transport(&qla2xxx_transport_functions)); -} - void qla2x00_init_host_attr(scsi_qla_host_t *ha) { diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index e4bfe4d5bbe..2efec6c24d6 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -24,7 +24,6 @@ #define __QLA_GBL_H #include <linux/interrupt.h> -#include <scsi/scsi_transport.h> extern void qla2x00_remove_one(struct pci_dev *); extern int qla2x00_probe_one(struct pci_dev *, struct qla_board_info *); @@ -248,9 +247,10 @@ extern void qla2x00_cancel_io_descriptors(scsi_qla_host_t *); /* * Global Function Prototypes in qla_attr.c source file. */ +struct fc_function_template; +extern struct fc_function_template qla2xxx_transport_functions; extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *); extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *); -extern struct scsi_transport_template *qla2x00_alloc_transport_tmpl(void); extern void qla2x00_init_host_attr(scsi_qla_host_t *); extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *); extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *); diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 84db911318c..579448222d6 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2350,7 +2350,8 @@ qla2x00_module_init(void) #if DEBUG_QLA2100 strcat(qla2x00_version_str, "-debug"); #endif - qla2xxx_transport_template = qla2x00_alloc_transport_tmpl(); + qla2xxx_transport_template = + fc_attach_transport(&qla2xxx_transport_functions); if (!qla2xxx_transport_template) return -ENODEV; |