qla2xxx: remove dead code, add missing statics
Subsystems (2)
PATCH 1/1 qla2xxx: remove dead code, add missing statics
===== drivers/scsi/qla2xxx/qla_devtbl.h 1.2 vs edited =====
drivers/scsi/qla2xxx/qla_devtbl.h +2 -2
@@ -3,7 +3,7 @@/* * Adapter model names. */ -char *qla2x00_model_name[QLA_MODEL_NAMES ] = { +static char *qla2x00_model_name[QLA_MODEL_NAMES ] = {"QLA2340" ,/* 0x100 */ "QLA2342" ,/* 0x101 */ "QLA2344" ,/* 0x102 */
@@ -39,7 +39,7 @@"QLA4040C" /* 0x120 */ }; -char *qla2x00_model_desc[QLA_MODEL_NAMES ] = { +static char *qla2x00_model_desc[QLA_MODEL_NAMES ] = {"133MHz PCI-X to 2Gb FC, Single Channel" ,/* 0x100 */ "133MHz PCI-X to 2Gb FC, Dual Channel" ,/* 0x101 */ "133MHz PCI-X to 2Gb FC, Quad Channel" ,/* 0x102 */
===== drivers/scsi/qla2xxx/qla_gbl.h 1.14 vs edited =====
drivers/scsi/qla2xxx/qla_gbl.h +0 -42
101 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_init.c 1.37 vs edited =====
drivers/scsi/qla2xxx/qla_init.c +5 -509
553 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_iocb.c 1.14 vs edited =====
drivers/scsi/qla2xxx/qla_iocb.c +2 -95
115 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_mbx.c 1.15 vs edited =====
drivers/scsi/qla2xxx/qla_mbx.c +1 -502
533 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_os.c 1.49 vs edited =====
drivers/scsi/qla2xxx/qla_os.c +15 -122
227 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_rscn.c 1.9 vs edited =====
drivers/scsi/qla2xxx/qla_rscn.c +1 -1
@@ -87,7 +87,7 @@/** * Mailbox IOCB callback array. **/ -int (*iocb_function_cb_list[LAST_IOCB_CB ]) +static int (*iocb_function_cb_list[LAST_IOCB_CB ]) (scsi_qla_host_t *,struct io_descriptor *,struct mbx_entry *) = { qla2x00_send_abort_iocb_cb,
ping
===== drivers/scsi/qla2xxx/qla_devtbl.h 1.2 vs edited =====
drivers/scsi/qla2xxx/qla_devtbl.h +2 -2
@@ -3,7 +3,7 @@/* * Adapter model names. */ -char *qla2x00_model_name[QLA_MODEL_NAMES ] = { +static char *qla2x00_model_name[QLA_MODEL_NAMES ] = {"QLA2340" ,/* 0x100 */ "QLA2342" ,/* 0x101 */ "QLA2344" ,/* 0x102 */
@@ -39,7 +39,7 @@"QLA4040C" /* 0x120 */ }; -char *qla2x00_model_desc[QLA_MODEL_NAMES ] = { +static char *qla2x00_model_desc[QLA_MODEL_NAMES ] = {"133MHz PCI-X to 2Gb FC, Single Channel" ,/* 0x100 */ "133MHz PCI-X to 2Gb FC, Dual Channel" ,/* 0x101 */ "133MHz PCI-X to 2Gb FC, Quad Channel" ,/* 0x102 */
===== drivers/scsi/qla2xxx/qla_gbl.h 1.14 vs edited =====
drivers/scsi/qla2xxx/qla_gbl.h +0 -42
101 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_init.c 1.37 vs edited =====
drivers/scsi/qla2xxx/qla_init.c +5 -509
553 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_iocb.c 1.14 vs edited =====
drivers/scsi/qla2xxx/qla_iocb.c +2 -95
115 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_mbx.c 1.15 vs edited =====
drivers/scsi/qla2xxx/qla_mbx.c +1 -502
533 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_os.c 1.49 vs edited =====
drivers/scsi/qla2xxx/qla_os.c +15 -122
227 lines not on this page · raw message
===== drivers/scsi/qla2xxx/qla_rscn.c 1.9 vs edited =====
drivers/scsi/qla2xxx/qla_rscn.c +1 -1
@@ -87,7 +87,7 @@/** * Mailbox IOCB callback array. **/ -int (*iocb_function_cb_list[LAST_IOCB_CB ]) +static int (*iocb_function_cb_list[LAST_IOCB_CB ]) (scsi_qla_host_t *,struct io_descriptor *,struct mbx_entry *) = { qla2x00_send_abort_iocb_cb,
drivers/scsi/qla2xxx/qla_devtbl.h
Quoted 6 lines · Christoph Hellwig
ping
=====
drivers/scsi/qla2xxx/qla_devtbl.h1.2 vs edited =====drivers/scsi/qla2xxx/qla_devtbl.h +0
-0
Could you hold off on adding this patch as-is as it conflicts with several patches I have queued up for submission -- which I plan to upload for submission by mid-week.
I'll integrate a slightly modded form of this patch then.
Thanks for you patience...
Andrew