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

Commit 441d1072 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Remove obsolete firmware-loader-module support. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 4971cd22

drivers/scsi/qla2xxx/Kconfig

+0 −45
Original line number Diff line number Diff line
@@ -24,48 +24,3 @@ config SCSI_QLA_FC 
	Firmware images can be retrieved from:



		ftp://ftp.qlogic.com/outgoing/linux/firmware/
 


	NOTE: The original method of building firmware-loader

	modules has been deprecated as the firmware-images will

	be removed from the kernel sources.



config SCSI_QLA2XXX_EMBEDDED_FIRMWARE

	bool "  Use firmware-loader modules (DEPRECATED)"

	depends on SCSI_QLA_FC

	help

	  This option offers you the deprecated firmware-loader

	  modules that have been obsoleted by the usage of the

	  Firmware Loader interface in the qla2xxx driver.



config SCSI_QLA21XX

	tristate "  Build QLogic ISP2100 firmware-module"

	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE

	---help---

	This driver supports the QLogic 21xx (ISP2100) host adapter family.



config SCSI_QLA22XX

	tristate "  Build QLogic ISP2200 firmware-module"

	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE

	---help---

	This driver supports the QLogic 22xx (ISP2200) host adapter family.



config SCSI_QLA2300

	tristate "  Build QLogic ISP2300/ISP6312 firmware-module"

	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE

	---help---

	This driver supports the QLogic 2300 (ISP2300, ISP2312 and

	ISP6312) host adapter family.



config SCSI_QLA2322

	tristate "  Build QLogic ISP2322/ISP6322 firmware-module"

	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE

	---help---

	This driver supports the QLogic 2322 (ISP2322 and ISP6322) host

	adapter family.



config SCSI_QLA24XX

	tristate "  Build QLogic ISP24xx firmware-module"

	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE

	---help---

	This driver supports the QLogic 24xx (ISP2422 and ISP2432) host

	adapter family.

drivers/scsi/qla2xxx/Makefile

+0 −14
Original line number Diff line number Diff line 
EXTRA_CFLAGS += -DUNIQUE_FW_NAME



qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \

		qla_dbg.o qla_sup.o qla_attr.o



obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
 


qla2100-y := ql2100.o ql2100_fw.o

qla2200-y := ql2200.o ql2200_fw.o

qla2300-y := ql2300.o ql2300_fw.o

qla2322-y := ql2322.o ql2322_fw.o

qla2400-y := ql2400.o ql2400_fw.o



obj-$(CONFIG_SCSI_QLA21XX) += qla2xxx.o qla2100.o

obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o qla2200.o

obj-$(CONFIG_SCSI_QLA2300) += qla2xxx.o qla2300.o

obj-$(CONFIG_SCSI_QLA2322) += qla2xxx.o qla2322.o

obj-$(CONFIG_SCSI_QLA24XX) += qla2xxx.o qla2400.o

drivers/scsi/qla2xxx/ql2100.c

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
/*

 * QLogic Fibre Channel HBA Driver

 * Copyright (C)  2003 Christoph Hellwig.

 * Copyright (c)  2003-2005 QLogic Corporation

 *

 * See LICENSE.qla2xxx for copyright and licensing details.

 */

#include <linux/init.h>

#include <linux/module.h>

#include <linux/pci.h>



#include "qla_def.h"



static char qla_driver_name[] = "qla2100";



extern unsigned char  fw2100tp_version[];

extern unsigned char  fw2100tp_version_str[];

extern unsigned short fw2100tp_addr01;

extern unsigned short fw2100tp_code01[];

extern unsigned short fw2100tp_length01;



static struct qla_fw_info qla_fw_tbl[] = {

	{

		.addressing	= FW_INFO_ADDR_NORMAL,

		.fwcode		= &fw2100tp_code01[0],

		.fwlen		= &fw2100tp_length01,

		.fwstart	= &fw2100tp_addr01,

	},



	{ FW_INFO_ADDR_NOMORE, },

};



static struct qla_board_info qla_board_tbl = {

	.drv_name	= qla_driver_name,



	.isp_name	= "ISP2100",

	.fw_info	= qla_fw_tbl,

};



static struct pci_device_id qla2100_pci_tbl[] = {

	{

		.vendor		= PCI_VENDOR_ID_QLOGIC,

		.device		= PCI_DEVICE_ID_QLOGIC_ISP2100,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (unsigned long)&qla_board_tbl,

	},



	{0, 0},

};

MODULE_DEVICE_TABLE(pci, qla2100_pci_tbl);



static int __devinit

qla2100_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)

{

	return qla2x00_probe_one(pdev,

	    (struct qla_board_info *)id->driver_data);

}



static void __devexit

qla2100_remove_one(struct pci_dev *pdev)

{

	qla2x00_remove_one(pdev);

}



static struct pci_driver qla2100_pci_driver = {

	.name		= "qla2100",

	.id_table	= qla2100_pci_tbl,

	.probe		= qla2100_probe_one,

	.remove		= __devexit_p(qla2100_remove_one),

};



static int __init

qla2100_init(void)

{

	return pci_module_init(&qla2100_pci_driver);

}



static void __exit

qla2100_exit(void)

{

	pci_unregister_driver(&qla2100_pci_driver);

}



module_init(qla2100_init);

module_exit(qla2100_exit);



MODULE_AUTHOR("QLogic Corporation");

MODULE_DESCRIPTION("QLogic ISP21xx FC-SCSI Host Bus Adapter driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(QLA2XXX_VERSION);

drivers/scsi/qla2xxx/ql2100_fw.c

deleted100644 → 0
+0 −4848

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla2xxx/ql2200.c

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
/*

 * QLogic Fibre Channel HBA Driver

 * Copyright (C)  2003 Christoph Hellwig.

 * Copyright (c)  2003-2005 QLogic Corporation

 *

 * See LICENSE.qla2xxx for copyright and licensing details.

 */

#include <linux/init.h>

#include <linux/module.h>

#include <linux/pci.h>



#include "qla_def.h"



static char qla_driver_name[] = "qla2200";



extern unsigned char  fw2200tp_version[];

extern unsigned char  fw2200tp_version_str[];

extern unsigned short fw2200tp_addr01;

extern unsigned short fw2200tp_code01[];

extern unsigned short fw2200tp_length01;



static struct qla_fw_info qla_fw_tbl[] = {

	{

		.addressing	= FW_INFO_ADDR_NORMAL,

		.fwcode		= &fw2200tp_code01[0],

		.fwlen		= &fw2200tp_length01,

		.fwstart	= &fw2200tp_addr01,

	},



	{ FW_INFO_ADDR_NOMORE, },

};



static struct qla_board_info qla_board_tbl = {

	.drv_name	= qla_driver_name,



	.isp_name	= "ISP2200",

	.fw_info	= qla_fw_tbl,

};



static struct pci_device_id qla2200_pci_tbl[] = {

	{

		.vendor		= PCI_VENDOR_ID_QLOGIC,

		.device		= PCI_DEVICE_ID_QLOGIC_ISP2200,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= (unsigned long)&qla_board_tbl,

	},



	{0, 0},

};

MODULE_DEVICE_TABLE(pci, qla2200_pci_tbl);



static int __devinit

qla2200_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)

{

	return qla2x00_probe_one(pdev,

	    (struct qla_board_info *)id->driver_data);

}



static void __devexit

qla2200_remove_one(struct pci_dev *pdev)

{

	qla2x00_remove_one(pdev);

}



static struct pci_driver qla2200_pci_driver = {

	.name		= "qla2200",

	.id_table	= qla2200_pci_tbl,

	.probe		= qla2200_probe_one,

	.remove		= __devexit_p(qla2200_remove_one),

};



static int __init

qla2200_init(void)

{

	return pci_module_init(&qla2200_pci_driver);

}



static void __exit

qla2200_exit(void)

{

	pci_unregister_driver(&qla2200_pci_driver);

}



module_init(qla2200_init);

module_exit(qla2200_exit);



MODULE_AUTHOR("QLogic Corporation");

MODULE_DESCRIPTION("QLogic ISP22xx FC-SCSI Host Bus Adapter driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(QLA2XXX_VERSION);