Skip to content

Commit a824ebb

Browse files
AdrianBunkJames Bottomley
AdrianBunk
authored and
James Bottomley
committed
[SCSI] qla2xxx: Code cleanups.
- make the following needlessly global code static: - qla_attr.c: qla24xx_vport_delete() - qla_attr.c: qla24xx_vport_disable() - qla_mid.c: qla24xx_allocate_vp_id() - qla_mid.c: qla24xx_find_vhost_by_name() - qla_mid.c: qla2x00_do_dpc_vp() - qla_os.c: struct qla2x00_driver_template - qla_os.c: qla2x00_stop_timer() - qla_os.c: qla2x00_mem_alloc() - qla_os.c: qla2x00_mem_free() - qla_sup.c: qla2x00_lock_nvram_access() - qla_sup.c: qla2x00_unlock_nvram_access() - qla_sup.c: qla2x00_get_nvram_word() - qla_sup.c: qla2x00_write_nvram_word() - #if 0 the following unused global functions: - qla_mbx.c: qla2x00_system_error() - qla_os.c: remove some unneeded function prototypes - removed unused functions: - qla_dbg.c: qla2x00_dump_pkt() - qla_mbx.c: qla2x00_get_serdes_params() - qla_mbx.c: qla2x00_get_idma_speed() - qla_mbx.c: qla24xx_get_vp_database() - qla_mbx.c: qla24xx_get_vp_entry() Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Small modifications and Signed-off-by: Andrew Vasquez <[email protected]> Signed-off-by: James Bottomley <[email protected]>
1 parent 50db6b1 commit a824ebb

File tree

7 files changed

+19
-238
lines changed

7 files changed

+19
-238
lines changed

‎drivers/scsi/qla2xxx/qla_attr.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/kthread.h>
1010
#include <linux/vmalloc.h>
1111

12-
int qla24xx_vport_disable(struct fc_vport *, bool);
12+
static int qla24xx_vport_disable(struct fc_vport *, bool);
1313

1414
/* SYSFS attributes --------------------------------------------------------- */
1515

@@ -1129,7 +1129,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
11291129
return FC_VPORT_FAILED;
11301130
}
11311131

1132-
int
1132+
static int
11331133
qla24xx_vport_delete(struct fc_vport *fc_vport)
11341134
{
11351135
scsi_qla_host_t *ha = shost_priv(fc_vport->shost);
@@ -1162,7 +1162,7 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
11621162
return 0;
11631163
}
11641164

1165-
int
1165+
static int
11661166
qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
11671167
{
11681168
scsi_qla_host_t *vha = fc_vport->dd_data;

‎drivers/scsi/qla2xxx/qla_dbg.c

-15
Original file line numberDiff line numberDiff line change
@@ -1428,21 +1428,6 @@ qla2x00_print_scsi_cmd(struct scsi_cmnd * cmd)
14281428
printk(" sp flags=0x%x\n", sp->flags);
14291429
}
14301430

1431-
void
1432-
qla2x00_dump_pkt(void *pkt)
1433-
{
1434-
uint32_t i;
1435-
uint8_t *data = (uint8_t *) pkt;
1436-
1437-
for (i = 0; i < 64; i++) {
1438-
if (!(i % 4))
1439-
printk("\n%02x: ", i);
1440-
1441-
printk("%02x ", data[i]);
1442-
}
1443-
printk("\n");
1444-
}
1445-
14461431
#if defined(QL_DEBUG_ROUTINES)
14471432
/*
14481433
* qla2x00_formatted_dump_buffer

‎drivers/scsi/qla2xxx/qla_gbl.h

-25
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,20 @@ extern int qla2x00_loop_reset(scsi_qla_host_t *);
7070
/*
7171
* Global Functions in qla_mid.c source file.
7272
*/
73-
extern struct scsi_host_template qla2x00_driver_template;
7473
extern struct scsi_host_template qla24xx_driver_template;
7574
extern struct scsi_transport_template *qla2xxx_transport_vport_template;
76-
extern uint8_t qla2x00_mem_alloc(scsi_qla_host_t *);
7775
extern void qla2x00_timer(scsi_qla_host_t *);
7876
extern void qla2x00_start_timer(scsi_qla_host_t *, void *, unsigned long);
79-
extern void qla2x00_stop_timer(scsi_qla_host_t *);
80-
extern uint32_t qla24xx_allocate_vp_id(scsi_qla_host_t *);
8177
extern void qla24xx_deallocate_vp_id(scsi_qla_host_t *);
8278
extern int qla24xx_disable_vp (scsi_qla_host_t *);
8379
extern int qla24xx_enable_vp (scsi_qla_host_t *);
84-
extern void qla2x00_mem_free(scsi_qla_host_t *);
8580
extern int qla24xx_control_vp(scsi_qla_host_t *, int );
8681
extern int qla24xx_modify_vp_config(scsi_qla_host_t *);
8782
extern int qla2x00_send_change_request(scsi_qla_host_t *, uint16_t, uint16_t);
8883
extern void qla2x00_vp_stop_timer(scsi_qla_host_t *);
8984
extern int qla24xx_configure_vhba (scsi_qla_host_t *);
90-
extern int qla24xx_get_vp_entry(scsi_qla_host_t *, uint16_t, int);
91-
extern int qla24xx_get_vp_database(scsi_qla_host_t *, uint16_t);
92-
extern int qla2x00_do_dpc_vp(scsi_qla_host_t *);
9385
extern void qla24xx_report_id_acquisition(scsi_qla_host_t *,
9486
struct vp_rpt_id_entry_24xx *);
95-
extern scsi_qla_host_t * qla24xx_find_vhost_by_name(scsi_qla_host_t *,
96-
uint8_t *);
9787
extern void qla2x00_do_dpc_all_vps(scsi_qla_host_t *);
9888
extern int qla24xx_vport_create_req_sanity_check(struct fc_vport *);
9989
extern scsi_qla_host_t * qla24xx_create_vhost(struct fc_vport *);
@@ -113,7 +103,6 @@ extern void qla2xxx_wake_dpc(scsi_qla_host_t *);
113103
extern void qla2x00_alert_all_vps(scsi_qla_host_t *, uint16_t *);
114104
extern void qla2x00_async_event(scsi_qla_host_t *, uint16_t *);
115105
extern void qla2x00_vp_abort_isp(scsi_qla_host_t *);
116-
extern int qla24xx_vport_delete(struct fc_vport *);
117106

118107
/*
119108
* Global Function Prototypes in qla_iocb.c source file.
@@ -232,12 +221,6 @@ qla24xx_get_isp_stats(scsi_qla_host_t *, struct link_statistics *,
232221
extern int qla24xx_abort_command(scsi_qla_host_t *, srb_t *);
233222
extern int qla24xx_abort_target(fc_port_t *);
234223

235-
extern int qla2x00_system_error(scsi_qla_host_t *);
236-
237-
extern int
238-
qla2x00_get_serdes_params(scsi_qla_host_t *, uint16_t *, uint16_t *,
239-
uint16_t *);
240-
241224
extern int
242225
qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);
243226

@@ -250,9 +233,6 @@ qla2x00_trace_control(scsi_qla_host_t *, uint16_t, dma_addr_t, uint16_t);
250233
extern int
251234
qla2x00_read_sfp(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t, uint16_t);
252235

253-
extern int
254-
qla2x00_get_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t *, uint16_t *);
255-
256236
extern int
257237
qla2x00_set_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t *);
258238

@@ -271,11 +251,7 @@ extern void qla2x00_free_irqs(scsi_qla_host_t *);
271251
/*
272252
* Global Function Prototypes in qla_sup.c source file.
273253
*/
274-
extern void qla2x00_lock_nvram_access(scsi_qla_host_t *);
275-
extern void qla2x00_unlock_nvram_access(scsi_qla_host_t *);
276254
extern void qla2x00_release_nvram_protection(scsi_qla_host_t *);
277-
extern uint16_t qla2x00_get_nvram_word(scsi_qla_host_t *, uint32_t);
278-
extern void qla2x00_write_nvram_word(scsi_qla_host_t *, uint32_t, uint16_t);
279255
extern uint32_t *qla24xx_read_flash_data(scsi_qla_host_t *, uint32_t *,
280256
uint32_t, uint32_t);
281257
extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,
@@ -322,7 +298,6 @@ extern void qla25xx_fw_dump(scsi_qla_host_t *, int);
322298
extern void qla2x00_dump_regs(scsi_qla_host_t *);
323299
extern void qla2x00_dump_buffer(uint8_t *, uint32_t);
324300
extern void qla2x00_print_scsi_cmd(struct scsi_cmnd *);
325-
extern void qla2x00_dump_pkt(void *);
326301

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

‎drivers/scsi/qla2xxx/qla_mbx.c

+3-174
Original file line numberDiff line numberDiff line change
@@ -2248,6 +2248,8 @@ qla24xx_abort_target(fc_port_t *fcport)
22482248
return rval;
22492249
}
22502250

2251+
#if 0
2252+
22512253
int
22522254
qla2x00_system_error(scsi_qla_host_t *ha)
22532255
{
@@ -2277,47 +2279,7 @@ qla2x00_system_error(scsi_qla_host_t *ha)
22772279
return rval;
22782280
}
22792281

2280-
/**
2281-
* qla2x00_get_serdes_params() -
2282-
* @ha: HA context
2283-
*
2284-
* Returns
2285-
*/
2286-
int
2287-
qla2x00_get_serdes_params(scsi_qla_host_t *ha, uint16_t *sw_em_1g,
2288-
uint16_t *sw_em_2g, uint16_t *sw_em_4g)
2289-
{
2290-
int rval;
2291-
mbx_cmd_t mc;
2292-
mbx_cmd_t *mcp = &mc;
2293-
2294-
DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
2295-
2296-
mcp->mb[0] = MBC_SERDES_PARAMS;
2297-
mcp->mb[1] = 0;
2298-
mcp->out_mb = MBX_1|MBX_0;
2299-
mcp->in_mb = MBX_4|MBX_3|MBX_2|MBX_0;
2300-
mcp->tov = 30;
2301-
mcp->flags = 0;
2302-
rval = qla2x00_mailbox_command(ha, mcp);
2303-
2304-
if (rval != QLA_SUCCESS) {
2305-
/*EMPTY*/
2306-
DEBUG2_3_11(printk("%s(%ld): failed=%x (%x).\n", __func__,
2307-
ha->host_no, rval, mcp->mb[0]));
2308-
} else {
2309-
DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
2310-
2311-
if (sw_em_1g)
2312-
*sw_em_1g = mcp->mb[2];
2313-
if (sw_em_2g)
2314-
*sw_em_2g = mcp->mb[3];
2315-
if (sw_em_4g)
2316-
*sw_em_4g = mcp->mb[4];
2317-
}
2318-
2319-
return rval;
2320-
}
2282+
#endif /* 0 */
23212283

23222284
/**
23232285
* qla2x00_set_serdes_params() -
@@ -2465,49 +2427,6 @@ qla2x00_read_sfp(scsi_qla_host_t *ha, dma_addr_t sfp_dma, uint16_t addr,
24652427
return rval;
24662428
}
24672429

2468-
int
2469-
qla2x00_get_idma_speed(scsi_qla_host_t *ha, uint16_t loop_id,
2470-
uint16_t *port_speed, uint16_t *mb)
2471-
{
2472-
int rval;
2473-
mbx_cmd_t mc;
2474-
mbx_cmd_t *mcp = &mc;
2475-
2476-
if (!IS_IIDMA_CAPABLE(ha))
2477-
return QLA_FUNCTION_FAILED;
2478-
2479-
DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
2480-
2481-
mcp->mb[0] = MBC_PORT_PARAMS;
2482-
mcp->mb[1] = loop_id;
2483-
mcp->mb[2] = mcp->mb[3] = mcp->mb[4] = mcp->mb[5] = 0;
2484-
mcp->out_mb = MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
2485-
mcp->in_mb = MBX_5|MBX_4|MBX_3|MBX_1|MBX_0;
2486-
mcp->tov = 30;
2487-
mcp->flags = 0;
2488-
rval = qla2x00_mailbox_command(ha, mcp);
2489-
2490-
/* Return mailbox statuses. */
2491-
if (mb != NULL) {
2492-
mb[0] = mcp->mb[0];
2493-
mb[1] = mcp->mb[1];
2494-
mb[3] = mcp->mb[3];
2495-
mb[4] = mcp->mb[4];
2496-
mb[5] = mcp->mb[5];
2497-
}
2498-
2499-
if (rval != QLA_SUCCESS) {
2500-
DEBUG2_3_11(printk("%s(%ld): failed=%x.\n", __func__,
2501-
ha->host_no, rval));
2502-
} else {
2503-
DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
2504-
if (port_speed)
2505-
*port_speed = mcp->mb[3];
2506-
}
2507-
2508-
return rval;
2509-
}
2510-
25112430
int
25122431
qla2x00_set_idma_speed(scsi_qla_host_t *ha, uint16_t loop_id,
25132432
uint16_t port_speed, uint16_t *mb)
@@ -2551,96 +2470,6 @@ qla2x00_set_idma_speed(scsi_qla_host_t *ha, uint16_t loop_id,
25512470
return rval;
25522471
}
25532472

2554-
/*
2555-
* qla24xx_get_vp_database
2556-
* Get the VP's database for all configured ports.
2557-
*
2558-
* Input:
2559-
* ha = adapter block pointer.
2560-
* size = size of initialization control block.
2561-
*
2562-
* Returns:
2563-
* qla2x00 local function return status code.
2564-
*
2565-
* Context:
2566-
* Kernel context.
2567-
*/
2568-
int
2569-
qla24xx_get_vp_database(scsi_qla_host_t *ha, uint16_t size)
2570-
{
2571-
int rval;
2572-
mbx_cmd_t mc;
2573-
mbx_cmd_t *mcp = &mc;
2574-
2575-
DEBUG11(printk("scsi(%ld):%s - entered.\n",
2576-
ha->host_no, __func__));
2577-
2578-
mcp->mb[0] = MBC_MID_GET_VP_DATABASE;
2579-
mcp->mb[2] = MSW(ha->init_cb_dma);
2580-
mcp->mb[3] = LSW(ha->init_cb_dma);
2581-
mcp->mb[4] = 0;
2582-
mcp->mb[5] = 0;
2583-
mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
2584-
mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
2585-
mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
2586-
mcp->in_mb = MBX_1|MBX_0;
2587-
mcp->buf_size = size;
2588-
mcp->flags = MBX_DMA_OUT;
2589-
mcp->tov = MBX_TOV_SECONDS;
2590-
rval = qla2x00_mailbox_command(ha, mcp);
2591-
2592-
if (rval != QLA_SUCCESS) {
2593-
/*EMPTY*/
2594-
DEBUG2_3_11(printk("%s(%ld): failed=%x "
2595-
"mb0=%x.\n",
2596-
__func__, ha->host_no, rval, mcp->mb[0]));
2597-
} else {
2598-
/*EMPTY*/
2599-
DEBUG11(printk("%s(%ld): done.\n",
2600-
__func__, ha->host_no));
2601-
}
2602-
2603-
return rval;
2604-
}
2605-
2606-
int
2607-
qla24xx_get_vp_entry(scsi_qla_host_t *ha, uint16_t size, int vp_id)
2608-
{
2609-
int rval;
2610-
mbx_cmd_t mc;
2611-
mbx_cmd_t *mcp = &mc;
2612-
2613-
DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
2614-
2615-
mcp->mb[0] = MBC_MID_GET_VP_ENTRY;
2616-
mcp->mb[2] = MSW(ha->init_cb_dma);
2617-
mcp->mb[3] = LSW(ha->init_cb_dma);
2618-
mcp->mb[4] = 0;
2619-
mcp->mb[5] = 0;
2620-
mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
2621-
mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
2622-
mcp->mb[9] = vp_id;
2623-
mcp->out_mb = MBX_9|MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
2624-
mcp->in_mb = MBX_0;
2625-
mcp->buf_size = size;
2626-
mcp->flags = MBX_DMA_OUT;
2627-
mcp->tov = 30;
2628-
rval = qla2x00_mailbox_command(ha, mcp);
2629-
2630-
if (rval != QLA_SUCCESS) {
2631-
/*EMPTY*/
2632-
DEBUG2_3_11(printk("qla24xx_get_vp_entry(%ld): failed=%x "
2633-
"mb0=%x.\n",
2634-
ha->host_no, rval, mcp->mb[0]));
2635-
} else {
2636-
/*EMPTY*/
2637-
DEBUG11(printk("qla24xx_get_vp_entry(%ld): done.\n",
2638-
ha->host_no));
2639-
}
2640-
2641-
return rval;
2642-
}
2643-
26442473
void
26452474
qla24xx_report_id_acquisition(scsi_qla_host_t *ha,
26462475
struct vp_rpt_id_entry_24xx *rptid_entry)

‎drivers/scsi/qla2xxx/qla_mid.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ qla2x00_vp_stop_timer(scsi_qla_host_t *vha)
3939
}
4040
}
4141

42-
uint32_t
42+
static uint32_t
4343
qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
4444
{
4545
uint32_t vp_id;
@@ -77,7 +77,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
7777
up(&ha->vport_sem);
7878
}
7979

80-
scsi_qla_host_t *
80+
static scsi_qla_host_t *
8181
qla24xx_find_vhost_by_name(scsi_qla_host_t *ha, uint8_t *port_name)
8282
{
8383
scsi_qla_host_t *vha;
@@ -265,7 +265,7 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
265265
qla24xx_enable_vp(vha);
266266
}
267267

268-
int
268+
static int
269269
qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
270270
{
271271
if (test_and_clear_bit(VP_IDX_ACQUIRED, &vha->vp_flags)) {

0 commit comments

Comments
 (0)