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

Commit 1c97a12a authored Apr 21, 2005 by Andrew Vasquez Committed by James Bottomley Apr 21, 2005

[SCSI] qla2xxx: remove a transport #include



Make transport-functions structure non-static.  Replace #include of
scsi_transport.h with a forward declaration.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent 40b7bc06

drivers/scsi/qla2xxx/qla_attr.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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;		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_node_name = 1,
	.show_host_port_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		void
	qla2x00_init_host_attr(scsi_qla_host_t *ha)		qla2x00_init_host_attr(scsi_qla_host_t *ha)
	{		{

drivers/scsi/qla2xxx/qla_gbl.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@
	#define __QLA_GBL_H		#define __QLA_GBL_H

	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <scsi/scsi_transport.h>

	extern void qla2x00_remove_one(struct pci_dev *);		extern void qla2x00_remove_one(struct pci_dev *);
	extern int qla2x00_probe_one(struct pci_dev , struct qla_board_info );		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.		* 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_alloc_sysfs_attr(scsi_qla_host_t *);
	extern void qla2x00_free_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_init_host_attr(scsi_qla_host_t *);
	extern void qla2x00_alloc_sysfs_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 *);		extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_os.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2350,7 +2350,8 @@ qla2x00_module_init(void)
	#if DEBUG_QLA2100		#if DEBUG_QLA2100
	strcat(qla2x00_version_str, "-debug");		strcat(qla2x00_version_str, "-debug");
	#endif		#endif
	qla2xxx_transport_template = qla2x00_alloc_transport_tmpl();		qla2xxx_transport_template =
			fc_attach_transport(&qla2xxx_transport_functions);
	if (!qla2xxx_transport_template)		if (!qla2xxx_transport_template)
	return -ENODEV;		return -ENODEV;