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

Commit 0ddda2d1 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Remove unused and obsolete #define's. 



Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 2ae2b370

drivers/scsi/qla2xxx/qla_gbl.h

+0 −2
Original line number Diff line number Diff line
@@ -151,10 +151,8 @@ qla2x00_issue_iocb(scsi_qla_host_t *, void *, dma_addr_t, size_t); 
extern int

qla2x00_abort_command(scsi_qla_host_t *, srb_t *);



#if USE_ABORT_TGT

extern int

qla2x00_abort_target(fc_port_t *);

#endif



extern int

qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *,

drivers/scsi/qla2xxx/qla_mbx.c

+0 −2
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp) 
	return rval;

}



#if USE_ABORT_TGT

/*

 * qla2x00_abort_target

 *	Issue abort target mailbox command.
@@ -834,7 +833,6 @@ qla2x00_abort_target(fc_port_t *fcport) 


	return rval;

}

#endif



/*

 * qla2x00_get_adapter_id

drivers/scsi/qla2xxx/qla_os.c

+0 −9
Original line number Diff line number Diff line
@@ -816,15 +816,6 @@ qla2xxx_eh_device_reset(struct scsi_cmnd *cmd) 
	if (qla2x00_wait_for_loop_ready(ha) == QLA_SUCCESS) {

		if (qla2x00_device_reset(ha, fcport) == 0)

			ret = SUCCESS;



#if defined(LOGOUT_AFTER_DEVICE_RESET)

		if (ret == SUCCESS) {

			if (fcport->flags & FC_FABRIC_DEVICE) {

				ha->isp_ops->fabric_logout(ha, fcport->loop_id);

				qla2x00_mark_device_lost(ha, fcport, 0, 0);

			}

		}

#endif

	} else {

		DEBUG2(printk(KERN_INFO

		    "%s failed: loop not ready\n",__func__));

drivers/scsi/qla2xxx/qla_settings.h

+0 −14
Original line number Diff line number Diff line
@@ -4,23 +4,9 @@ 
 *

 * See LICENSE.qla2xxx for copyright and licensing details.

 */

/*

 * Compile time Options:

 *     0 - Disable and 1 - Enable

 */

#define DEBUG_QLA2100		0	/* For Debug of qla2x00 */



#define USE_ABORT_TGT		1	/* Use Abort Target mbx cmd */



#define MAX_RETRIES_OF_ISP_ABORT	5



/* Max time to wait for the loop to be in LOOP_READY state */

#define MAX_LOOP_TIMEOUT	(60 * 5)



/*

 * Some vendor subsystems do not recover properly after a device reset.  Define

 * the following to force a logout after a successful device reset.

 */

#undef LOGOUT_AFTER_DEVICE_RESET



#include "qla_version.h"