diff options
author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-03-26 10:30:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-04-04 07:36:25 -0400 |
commit | b2fc77bc1bcbe856a9cbfd6d2ed2a953d4e6d3a8 (patch) | |
tree | ebd6579494863b2184bb04663686ac079b2c12fa | |
parent | 893311298a96c18b7a4a28c111cf9edf8fa27fed (diff) |
media: staging: atomisp: get rid of stupid statements
It makes no sense to have a do nothing statement like:
(void)stage;
Fix those warnings:
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c:3808 sh_css_param_update_isp_params() error: uninitialized symbol 'stage'.
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1444 sh_css_update_host2sp_offline_frame() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'.
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1475 sh_css_update_host2sp_mipi_frame() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'.
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1502 sh_css_update_host2sp_mipi_metadata() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'.
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1522 sh_css_update_host2sp_num_mipi_frames() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'.
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c:1541 sh_css_update_host2sp_cont_num_raw_frames() error: uninitialized symbol 'HIVE_ADDR_host_sp_com'.
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
3 files changed, 3 insertions, 15 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c index 034437f8ca07..9958b275bd50 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c | |||
@@ -8082,7 +8082,6 @@ create_host_regular_capture_pipeline(struct ia_css_pipe *pipe) | |||
8082 | return err; | 8082 | return err; |
8083 | } | 8083 | } |
8084 | } | 8084 | } |
8085 | (void)frm; | ||
8086 | /* If we use copy iso primary, | 8085 | /* If we use copy iso primary, |
8087 | the input must be yuv iso raw */ | 8086 | the input must be yuv iso raw */ |
8088 | current_stage->args.copy_vf = | 8087 | current_stage->args.copy_vf = |
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c index 3c0e8f66f59a..ba2b96e330d0 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c | |||
@@ -3805,7 +3805,6 @@ sh_css_param_update_isp_params(struct ia_css_pipe *curr_pipe, | |||
3805 | 3805 | ||
3806 | enum sh_css_queue_id queue_id; | 3806 | enum sh_css_queue_id queue_id; |
3807 | 3807 | ||
3808 | (void)stage; | ||
3809 | pipe = curr_pipe->stream->pipes[i]; | 3808 | pipe = curr_pipe->stream->pipes[i]; |
3810 | pipeline = ia_css_pipe_get_pipeline(pipe); | 3809 | pipeline = ia_css_pipe_get_pipeline(pipe); |
3811 | pipe_num = ia_css_pipe_get_pipe_num(pipe); | 3810 | pipe_num = ia_css_pipe_get_pipe_num(pipe); |
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c index 9c6330783358..bb297184ba3a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | |||
@@ -71,7 +71,7 @@ | |||
71 | struct sh_css_sp_group sh_css_sp_group; | 71 | struct sh_css_sp_group sh_css_sp_group; |
72 | struct sh_css_sp_stage sh_css_sp_stage; | 72 | struct sh_css_sp_stage sh_css_sp_stage; |
73 | struct sh_css_isp_stage sh_css_isp_stage; | 73 | struct sh_css_isp_stage sh_css_isp_stage; |
74 | struct sh_css_sp_output sh_css_sp_output; | 74 | static struct sh_css_sp_output sh_css_sp_output; |
75 | static struct sh_css_sp_per_frame_data per_frame_data; | 75 | static struct sh_css_sp_per_frame_data per_frame_data; |
76 | 76 | ||
77 | /* true if SP supports frame loop and host2sp_commands */ | 77 | /* true if SP supports frame loop and host2sp_commands */ |
@@ -117,9 +117,9 @@ copy_isp_stage_to_sp_stage(void) | |||
117 | */ | 117 | */ |
118 | sh_css_sp_stage.enable.sdis = sh_css_isp_stage.binary_info.enable.dis; | 118 | sh_css_sp_stage.enable.sdis = sh_css_isp_stage.binary_info.enable.dis; |
119 | sh_css_sp_stage.enable.s3a = sh_css_isp_stage.binary_info.enable.s3a; | 119 | sh_css_sp_stage.enable.s3a = sh_css_isp_stage.binary_info.enable.s3a; |
120 | #ifdef ISP2401 | 120 | #ifdef ISP2401 |
121 | sh_css_sp_stage.enable.lace_stats = sh_css_isp_stage.binary_info.enable.lace_stats; | 121 | sh_css_sp_stage.enable.lace_stats = sh_css_isp_stage.binary_info.enable.lace_stats; |
122 | #endif | 122 | #endif |
123 | } | 123 | } |
124 | 124 | ||
125 | void | 125 | void |
@@ -1441,8 +1441,6 @@ sh_css_update_host2sp_offline_frame( | |||
1441 | unsigned int HIVE_ADDR_host_sp_com; | 1441 | unsigned int HIVE_ADDR_host_sp_com; |
1442 | unsigned int offset; | 1442 | unsigned int offset; |
1443 | 1443 | ||
1444 | (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ | ||
1445 | |||
1446 | assert(frame_num < NUM_CONTINUOUS_FRAMES); | 1444 | assert(frame_num < NUM_CONTINUOUS_FRAMES); |
1447 | 1445 | ||
1448 | /* Write new frame data into SP DMEM */ | 1446 | /* Write new frame data into SP DMEM */ |
@@ -1472,8 +1470,6 @@ sh_css_update_host2sp_mipi_frame( | |||
1472 | unsigned int HIVE_ADDR_host_sp_com; | 1470 | unsigned int HIVE_ADDR_host_sp_com; |
1473 | unsigned int offset; | 1471 | unsigned int offset; |
1474 | 1472 | ||
1475 | (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ | ||
1476 | |||
1477 | /* MIPI buffers are dedicated to port, so now there are more of them. */ | 1473 | /* MIPI buffers are dedicated to port, so now there are more of them. */ |
1478 | assert(frame_num < (N_CSI_PORTS * NUM_MIPI_FRAMES_PER_STREAM)); | 1474 | assert(frame_num < (N_CSI_PORTS * NUM_MIPI_FRAMES_PER_STREAM)); |
1479 | 1475 | ||
@@ -1499,8 +1495,6 @@ sh_css_update_host2sp_mipi_metadata( | |||
1499 | unsigned int HIVE_ADDR_host_sp_com; | 1495 | unsigned int HIVE_ADDR_host_sp_com; |
1500 | unsigned int o; | 1496 | unsigned int o; |
1501 | 1497 | ||
1502 | (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ | ||
1503 | |||
1504 | /* MIPI buffers are dedicated to port, so now there are more of them. */ | 1498 | /* MIPI buffers are dedicated to port, so now there are more of them. */ |
1505 | assert(frame_num < (N_CSI_PORTS * NUM_MIPI_FRAMES_PER_STREAM)); | 1499 | assert(frame_num < (N_CSI_PORTS * NUM_MIPI_FRAMES_PER_STREAM)); |
1506 | 1500 | ||
@@ -1519,8 +1513,6 @@ sh_css_update_host2sp_num_mipi_frames(unsigned num_frames) | |||
1519 | unsigned int HIVE_ADDR_host_sp_com; | 1513 | unsigned int HIVE_ADDR_host_sp_com; |
1520 | unsigned int offset; | 1514 | unsigned int offset; |
1521 | 1515 | ||
1522 | (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ | ||
1523 | |||
1524 | /* Write new frame data into SP DMEM */ | 1516 | /* Write new frame data into SP DMEM */ |
1525 | HIVE_ADDR_host_sp_com = sh_css_sp_fw.info.sp.host_sp_com; | 1517 | HIVE_ADDR_host_sp_com = sh_css_sp_fw.info.sp.host_sp_com; |
1526 | offset = (unsigned int)offsetof(struct host_sp_communication, host2sp_num_mipi_frames) | 1518 | offset = (unsigned int)offsetof(struct host_sp_communication, host2sp_num_mipi_frames) |
@@ -1538,8 +1530,6 @@ sh_css_update_host2sp_cont_num_raw_frames(unsigned num_frames, bool set_avail) | |||
1538 | unsigned int extra_num_frames, avail_num_frames; | 1530 | unsigned int extra_num_frames, avail_num_frames; |
1539 | unsigned int offset, offset_extra; | 1531 | unsigned int offset, offset_extra; |
1540 | 1532 | ||
1541 | (void)HIVE_ADDR_host_sp_com; /* Suppres warnings in CRUN */ | ||
1542 | |||
1543 | /* Write new frame data into SP DMEM */ | 1533 | /* Write new frame data into SP DMEM */ |
1544 | fw = &sh_css_sp_fw; | 1534 | fw = &sh_css_sp_fw; |
1545 | HIVE_ADDR_host_sp_com = fw->info.sp.host_sp_com; | 1535 | HIVE_ADDR_host_sp_com = fw->info.sp.host_sp_com; |