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

Commit 587f4cae authored Apr 03, 2008 by Andrew Vasquez Committed by James Bottomley Apr 07, 2008

[SCSI] qla2xxx: Cruft cleanup of functions and structures.



Strip unused (DEBUG-ONLY) enabled functions, inlines, useless
wrappers, and unused DPC flags from the code.  Another step in
the migration towards a cleaner (less-crusty) driver.

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

parent cb8dacbf

drivers/scsi/qla2xxx/qla_dbg.c

+0 −122

Original line number	Diff line number	Diff line
		@@ -1410,125 +1410,3 @@ qla2x00_dump_buffer(uint8_t * b, uint32_t size)
		if (cnt % 16)
		printk("\n");
		}

		/**************************************************************************
		* qla2x00_print_scsi_cmd
		* Dumps out info about the scsi cmd and srb.
		* Input
		* cmd : struct scsi_cmnd
		**************************************************************************/
		void
		qla2x00_print_scsi_cmd(struct scsi_cmnd * cmd)
		{
		int i;
		struct scsi_qla_host *ha;
		srb_t *sp;

		ha = shost_priv(cmd->device->host);

		sp = (srb_t *) cmd->SCp.ptr;
		printk("SCSI Command @=0x%p, Handle=0x%p\n", cmd, cmd->host_scribble);
		printk(" chan=0x%02x, target=0x%02x, lun=0x%02x, cmd_len=0x%02x\n",
		cmd->device->channel, cmd->device->id, cmd->device->lun,
		cmd->cmd_len);
		printk(" CDB: ");
		for (i = 0; i < cmd->cmd_len; i++) {
		printk("0x%02x ", cmd->cmnd[i]);
		}
		printk("\n seg_cnt=%d, allowed=%d, retries=%d\n",
		scsi_sg_count(cmd), cmd->allowed, cmd->retries);
		printk(" request buffer=0x%p, request buffer len=0x%x\n",
		scsi_sglist(cmd), scsi_bufflen(cmd));
		printk(" tag=%d, transfersize=0x%x\n",
		cmd->tag, cmd->transfersize);
		printk(" serial_number=%lx, SP=%p\n", cmd->serial_number, sp);
		printk(" data direction=%d\n", cmd->sc_data_direction);

		if (!sp)
		return;

		printk(" sp flags=0x%x\n", sp->flags);
		}

		#if defined(QL_DEBUG_ROUTINES)
		/*
		* qla2x00_formatted_dump_buffer
		* Prints string plus buffer.
		*
		* Input:
		* string = Null terminated string (no newline at end).
		* buffer = buffer address.
		* wd_size = word size 8, 16, 32 or 64 bits
		* count = number of words.
		*/
		void
		qla2x00_formatted_dump_buffer(char string, uint8_t buffer,
		uint8_t wd_size, uint32_t count)
		{
		uint32_t cnt;
		uint16_t *buf16;
		uint32_t *buf32;

		if (strcmp(string, "") != 0)
		printk("%s\n",string);

		switch (wd_size) {
		case 8:
		printk(" 0 1 2 3 4 5 6 7 "
		"8 9 Ah Bh Ch Dh Eh Fh\n");
		printk("-----------------------------------------"
		"-------------------------------------\n");

		for (cnt = 1; cnt <= count; cnt++, buffer++) {
		printk("%02x",*buffer);
		if (cnt % 16 == 0)
		printk("\n");
		else
		printk(" ");
		}
		if (cnt % 16 != 0)
		printk("\n");
		break;
		case 16:
		printk(" 0 2 4 6 8 Ah "
		" Ch Eh\n");
		printk("-----------------------------------------"
		"-------------\n");

		buf16 = (uint16_t *) buffer;
		for (cnt = 1; cnt <= count; cnt++, buf16++) {
		printk("%4x",*buf16);

		if (cnt % 8 == 0)
		printk("\n");
		else if (*buf16 < 10)
		printk(" ");
		else
		printk(" ");
		}
		if (cnt % 8 != 0)
		printk("\n");
		break;
		case 32:
		printk(" 0 4 8 Ch\n");
		printk("------------------------------------------\n");

		buf32 = (uint32_t *) buffer;
		for (cnt = 1; cnt <= count; cnt++, buf32++) {
		printk("%8x", *buf32);

		if (cnt % 4 == 0)
		printk("\n");
		else if (*buf32 < 10)
		printk(" ");
		else
		printk(" ");
		}
		if (cnt % 4 != 0)
		printk("\n");
		break;
		default:
		break;
		}
		}
		#endif

drivers/scsi/qla2xxx/qla_dbg.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -22,19 +22,6 @@
		/* #define QL_DEBUG_LEVEL_13 / / Output fdmi function trace msgs */
		/* #define QL_DEBUG_LEVEL_14 / / Output RSCN trace msgs */
		/* #define QL_DEBUG_LEVEL_15 / / Output NPIV trace msgs */
		/*
		* Local Macro Definitions.
		*/
		#if defined(QL_DEBUG_LEVEL_1) \|\| defined(QL_DEBUG_LEVEL_2) \|\| \
		defined(QL_DEBUG_LEVEL_3) \|\| defined(QL_DEBUG_LEVEL_4) \|\| \
		defined(QL_DEBUG_LEVEL_5) \|\| defined(QL_DEBUG_LEVEL_6) \|\| \
		defined(QL_DEBUG_LEVEL_7) \|\| defined(QL_DEBUG_LEVEL_8) \|\| \
		defined(QL_DEBUG_LEVEL_9) \|\| defined(QL_DEBUG_LEVEL_10) \|\| \
		defined(QL_DEBUG_LEVEL_11) \|\| defined(QL_DEBUG_LEVEL_12) \|\| \
		defined(QL_DEBUG_LEVEL_13) \|\| defined(QL_DEBUG_LEVEL_14) \|\| \
		defined(QL_DEBUG_LEVEL_15)
		#define QL_DEBUG_ROUTINES
		#endif

		/*
		* Macros use for debugging the driver.

drivers/scsi/qla2xxx/qla_def.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -2449,8 +2449,6 @@ typedef struct scsi_qla_host {
		#define MBX_TIMEDOUT BIT_5
		#define MBX_ACCESS_TIMEDOUT BIT_6

		mbx_cmd_t mc;

		/* Basic firmware related information. */
		uint16_t fw_major_version;
		uint16_t fw_minor_version;

drivers/scsi/qla2xxx/qla_gbl.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -38,9 +38,6 @@ extern int qla2x00_loop_resync(scsi_qla_host_t *);
		extern int qla2x00_fabric_login(scsi_qla_host_t , fc_port_t , uint16_t *);
		extern int qla2x00_local_device_login(scsi_qla_host_t , fc_port_t );

		extern void qla2x00_restart_queues(scsi_qla_host_t *, uint8_t);

		extern void qla2x00_rescan_fcports(scsi_qla_host_t *);
		extern void qla2x00_update_fcports(scsi_qla_host_t *);

		extern int qla2x00_abort_isp(scsi_qla_host_t *);
		@@ -312,7 +309,6 @@ extern void qla24xx_fw_dump(scsi_qla_host_t *, int);
		extern void qla25xx_fw_dump(scsi_qla_host_t *, int);
		extern void qla2x00_dump_regs(scsi_qla_host_t *);
		extern void qla2x00_dump_buffer(uint8_t *, uint32_t);
		extern void qla2x00_print_scsi_cmd(struct scsi_cmnd *);

		/*
		* Global Function Prototypes in qla_gs.c source file.

drivers/scsi/qla2xxx/qla_gs.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -6,12 +6,6 @@
		*/
		#include "qla_def.h"

		static inline struct ct_sns_req *
		qla2x00_prep_ct_req(struct ct_sns_req *, uint16_t, uint16_t);

		static inline struct sns_cmd_pkt *
		qla2x00_prep_sns_cmd(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);

		static int qla2x00_sns_ga_nxt(scsi_qla_host_t , fc_port_t );
		static int qla2x00_sns_gid_pt(scsi_qla_host_t , sw_info_t );
		static int qla2x00_sns_gpn_id(scsi_qla_host_t , sw_info_t );