forked from luck/tmp_suning_uos_patched
[SCSI] qla2xxx: Remove no-op IOCTL codes and macros.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
7914d004bc
commit
7469059d52
@ -285,13 +285,6 @@ extern void *qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
|
||||
extern void *qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
|
||||
extern int qla2x00_fdmi_register(scsi_qla_host_t *);
|
||||
|
||||
/*
|
||||
* Global Function Prototypes in qla_xioctl.c source file.
|
||||
*/
|
||||
#define qla2x00_enqueue_aen(ha, cmd, mode) do { } while (0)
|
||||
#define qla2x00_alloc_ioctl_mem(ha) (0)
|
||||
#define qla2x00_free_ioctl_mem(ha) do { } while (0)
|
||||
|
||||
/*
|
||||
* Global Function Prototypes in qla_attr.c source file.
|
||||
*/
|
||||
|
@ -395,10 +395,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
|
||||
set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
|
||||
|
||||
ha->flags.management_server_logged_in = 0;
|
||||
|
||||
/* Update AEN queue. */
|
||||
qla2x00_enqueue_aen(ha, MBA_LIP_OCCURRED, NULL);
|
||||
|
||||
break;
|
||||
|
||||
case MBA_LOOP_UP: /* Loop Up Event */
|
||||
@ -418,9 +414,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
|
||||
link_speed);
|
||||
|
||||
ha->flags.management_server_logged_in = 0;
|
||||
|
||||
/* Update AEN queue. */
|
||||
qla2x00_enqueue_aen(ha, MBA_LOOP_UP, NULL);
|
||||
break;
|
||||
|
||||
case MBA_LOOP_DOWN: /* Loop Down Event */
|
||||
@ -439,9 +432,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
|
||||
ha->link_data_rate = LDR_UNKNOWN;
|
||||
if (ql2xfdmienable)
|
||||
set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
|
||||
|
||||
/* Update AEN queue. */
|
||||
qla2x00_enqueue_aen(ha, MBA_LOOP_DOWN, NULL);
|
||||
break;
|
||||
|
||||
case MBA_LIP_RESET: /* LIP reset occurred */
|
||||
@ -460,10 +450,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
|
||||
|
||||
ha->operating_mode = LOOP;
|
||||
ha->flags.management_server_logged_in = 0;
|
||||
|
||||
/* Update AEN queue. */
|
||||
qla2x00_enqueue_aen(ha, MBA_LIP_RESET, NULL);
|
||||
|
||||
break;
|
||||
|
||||
case MBA_POINT_TO_POINT: /* Point-to-Point */
|
||||
@ -545,9 +531,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
|
||||
|
||||
set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
|
||||
set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
|
||||
|
||||
/* Update AEN queue. */
|
||||
qla2x00_enqueue_aen(ha, MBA_PORT_UPDATE, NULL);
|
||||
break;
|
||||
|
||||
case MBA_RSCN_UPDATE: /* State Change Registration */
|
||||
@ -584,9 +567,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
|
||||
|
||||
set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
|
||||
set_bit(RSCN_UPDATE, &ha->dpc_flags);
|
||||
|
||||
/* Update AEN queue. */
|
||||
qla2x00_enqueue_aen(ha, MBA_RSCN_UPDATE, &mb[0]);
|
||||
break;
|
||||
|
||||
/* case MBA_RIO_RESPONSE: */
|
||||
|
@ -1906,17 +1906,6 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)
|
||||
}
|
||||
memset(ha->init_cb, 0, ha->init_cb_size);
|
||||
|
||||
/* Allocate ioctl related memory. */
|
||||
if (qla2x00_alloc_ioctl_mem(ha)) {
|
||||
qla_printk(KERN_WARNING, ha,
|
||||
"Memory Allocation failed - ioctl_mem\n");
|
||||
|
||||
qla2x00_mem_free(ha);
|
||||
msleep(100);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if (qla2x00_allocate_sp_pool(ha)) {
|
||||
qla_printk(KERN_WARNING, ha,
|
||||
"Memory Allocation failed - "
|
||||
@ -2033,9 +2022,6 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
|
||||
return;
|
||||
}
|
||||
|
||||
/* free ioctl memory */
|
||||
qla2x00_free_ioctl_mem(ha);
|
||||
|
||||
/* free sp pool */
|
||||
qla2x00_free_sp_pool(ha);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user