hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: media: atomisp: Remove useless cast. 

Explicit type casting of variable, with same type as that of variable,
is not required. The following coccinelle script is used to remove it.

@@
type T;
T *ptr;
T p;
@@
(
- (T *)(&p)
+ &p
|
- (T *)ptr
+ ptr
|
- (T *)(ptr)
+ ptr
|
- (T)(p)
+ p
)

This patch also removes unnecessary parentheses.

Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Varsha Rao 2017-03-09 21:20:04 +05:30 committed by Greg Kroah-Hartman
parent f4fa03701d
commit bf5d0300f1
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/media/atomisp/i2c/gc2235.c
View File

@ -278,7 +278,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client,
if (ret) if (ret)
return ret; return ret;
buf->crop_horizontal_start = ((u16)reg_val_h << 8) | (u16)reg_val; buf->crop_horizontal_start = (reg_val_h << 8) | reg_val;
ret = gc2235_read_reg(client, GC2235_8BIT, ret = gc2235_read_reg(client, GC2235_8BIT,
GC2235_V_CROP_START_H, &reg_val_h); GC2235_V_CROP_START_H, &reg_val_h);
@ -287,7 +287,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client,
if (ret) if (ret)
return ret; return ret;
buf->crop_vertical_start = ((u16)reg_val_h << 8) | (u16)reg_val; buf->crop_vertical_start = (reg_val_h << 8) | reg_val;
ret = gc2235_read_reg(client, GC2235_8BIT, ret = gc2235_read_reg(client, GC2235_8BIT,
GC2235_H_OUTSIZE_H, &reg_val_h); GC2235_H_OUTSIZE_H, &reg_val_h);
@ -295,7 +295,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client,
GC2235_H_OUTSIZE_L, &reg_val); GC2235_H_OUTSIZE_L, &reg_val);
if (ret) if (ret)
return ret; return ret;
buf->output_width = ((u16)reg_val_h << 8) | (u16)reg_val; buf->output_width = (reg_val_h << 8) | reg_val;
ret = gc2235_read_reg(client, GC2235_8BIT, ret = gc2235_read_reg(client, GC2235_8BIT,
GC2235_V_OUTSIZE_H, &reg_val_h); GC2235_V_OUTSIZE_H, &reg_val_h);
@ -303,7 +303,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client,
GC2235_V_OUTSIZE_L, &reg_val); GC2235_V_OUTSIZE_L, &reg_val);
if (ret) if (ret)
return ret; return ret;
buf->output_height = ((u16)reg_val_h << 8) | (u16)reg_val; buf->output_height = (reg_val_h << 8) | reg_val;
buf->crop_horizontal_end = buf->crop_horizontal_start + buf->crop_horizontal_end = buf->crop_horizontal_start +
buf->output_width - 1; buf->output_width - 1;
@ -317,7 +317,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client,
if (ret) if (ret)
return ret; return ret;
dummy = ((u16)reg_val_h << 8) | (u16)reg_val; dummy = (reg_val_h << 8) | reg_val;
ret = gc2235_read_reg(client, GC2235_8BIT, ret = gc2235_read_reg(client, GC2235_8BIT,
GC2235_SH_DELAY_H, &reg_val_h); GC2235_SH_DELAY_H, &reg_val_h);
@ -702,9 +702,9 @@ static int distance(struct gc2235_resolution *res, u32 w, u32 h)
h_ratio = (res->height << 13) / h; h_ratio = (res->height << 13) / h;
if (h_ratio == 0) if (h_ratio == 0)
return -1; return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192)); match = abs(((w_ratio << 13) / h_ratio) - 8192);
if ((w_ratio < (int)8192) || (h_ratio < (int)8192) || if ((w_ratio < 8192) || (h_ratio < 8192) ||
(match > LARGEST_ALLOWED_RATIO_MISMATCH)) (match > LARGEST_ALLOWED_RATIO_MISMATCH))
return -1; return -1;
@ -873,7 +873,7 @@ static int gc2235_detect(struct i2c_client *client)
} }
ret = gc2235_read_reg(client, GC2235_8BIT, ret = gc2235_read_reg(client, GC2235_8BIT,
GC2235_SENSOR_ID_L, &low); GC2235_SENSOR_ID_L, &low);
id = ((((u16) high) << 8) | (u16) low); id = ((high << 8) | low);
if (id != GC2235_ID) { if (id != GC2235_ID) {
dev_err(&client->dev, "sensor ID error, 0x%x\n", id); dev_err(&client->dev, "sensor ID error, 0x%x\n", id);

4
drivers/staging/media/atomisp/i2c/mt9m114.c
View File

@ -618,9 +618,9 @@ static int distance(struct mt9m114_res_struct const *res, u32 w, u32 h)
h_ratio = (res->height << 13) / h; h_ratio = (res->height << 13) / h;
if (h_ratio == 0) if (h_ratio == 0)
return -1; return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192)); match = abs(((w_ratio << 13) / h_ratio) - 8192);
if ((w_ratio < (int)8192) || (h_ratio < (int)8192) || if ((w_ratio < 8192) || (h_ratio < 8192) ||
(match > LARGEST_ALLOWED_RATIO_MISMATCH)) (match > LARGEST_ALLOWED_RATIO_MISMATCH))
return -1; return -1;

6
drivers/staging/media/atomisp/i2c/ov2722.c
View File

@ -807,9 +807,9 @@ static int distance(struct ov2722_resolution *res, u32 w, u32 h)
h_ratio = (res->height << 13) / h; h_ratio = (res->height << 13) / h;
if (h_ratio == 0) if (h_ratio == 0)
return -1; return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192)); match = abs(((w_ratio << 13) / h_ratio) - 8192);
if ((w_ratio < (int)8192) || (h_ratio < (int)8192) || if ((w_ratio < 8192) || (h_ratio < 8192) ||
(match > LARGEST_ALLOWED_RATIO_MISMATCH)) (match > LARGEST_ALLOWED_RATIO_MISMATCH))
return -1; return -1;
@ -998,7 +998,7 @@ static int ov2722_detect(struct i2c_client *client)
} }
ret = ov2722_read_reg(client, OV2722_8BIT, ret = ov2722_read_reg(client, OV2722_8BIT,
OV2722_SC_CMMN_CHIP_ID_L, &low); OV2722_SC_CMMN_CHIP_ID_L, &low);
id = ((((u16) high) << 8) | (u16) low); id = (high << 8) | low;
if ((id != OV2722_ID) && (id != OV2720_ID)) { if ((id != OV2722_ID) && (id != OV2720_ID)) {
dev_err(&client->dev, "sensor ID error\n"); dev_err(&client->dev, "sensor ID error\n");

2
drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c
View File

@ -69,7 +69,7 @@ bool ia_css_isys_dma_channel_rmgr_acquire(
for (i = ISYS2401_DMA_CHANNEL_0; i < N_ISYS2401_DMA_CHANNEL; i++) { for (i = ISYS2401_DMA_CHANNEL_0; i < N_ISYS2401_DMA_CHANNEL; i++) {
if (bitop_getbit(cur_rsrc->active_table, i) == 0) { if (bitop_getbit(cur_rsrc->active_table, i) == 0) {
bitop_setbit(cur_rsrc->active_table, i); bitop_setbit(cur_rsrc->active_table, i);
*channel = (isys2401_dma_channel)i; *channel = i;
cur_rsrc->num_active++; cur_rsrc->num_active++;
retval = true; retval = true;
break; break;

8
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
View File

@ -122,7 +122,7 @@ sh_css_load_blob_info(const char *fw, const struct ia_css_fw_info *bi, struct ia
/* Special case: only one binary in fw */ /* Special case: only one binary in fw */
if (bi == NULL) bi = (const struct ia_css_fw_info *)fw; if (bi == NULL) bi = (const struct ia_css_fw_info *)fw;
name = (const char *)fw + bi->blob.prog_name_offset; name = fw + bi->blob.prog_name_offset;
blob = (const unsigned char *)fw + bi->blob.offset; blob = (const unsigned char *)fw + bi->blob.offset;
/* sanity check */ /* sanity check */
@ -201,7 +201,7 @@ sh_css_check_firmware_version(const char *fw_data)
struct sh_css_fw_bi_file_h *file_header; struct sh_css_fw_bi_file_h *file_header;
firmware_header = (struct firmware_header *)fw_data; firmware_header = (struct firmware_header *)fw_data;
file_header = (struct sh_css_fw_bi_file_h *)&firmware_header->file_header; file_header = &firmware_header->file_header;
if (strcmp(file_header->version, release_version) != 0) { if (strcmp(file_header->version, release_version) != 0) {
return false; return false;
@ -221,8 +221,8 @@ sh_css_load_firmware(const char *fw_data,
bool valid_firmware = false; bool valid_firmware = false;
firmware_header = (struct firmware_header *)fw_data; firmware_header = (struct firmware_header *)fw_data;
file_header = (struct sh_css_fw_bi_file_h *)&firmware_header->file_header; file_header = &firmware_header->file_header;
binaries = (struct ia_css_fw_info *)&firmware_header->binary_header; binaries = &firmware_header->binary_header;
strncpy(FW_rel_ver_name, file_header->version, min(sizeof(FW_rel_ver_name), sizeof(file_header->version)) - 1); strncpy(FW_rel_ver_name, file_header->version, min(sizeof(FW_rel_ver_name), sizeof(file_header->version)) - 1);
valid_firmware = sh_css_check_firmware_version(fw_data); valid_firmware = sh_css_check_firmware_version(fw_data);
if (!valid_firmware) { if (!valid_firmware) {

2
drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c
View File

@ -553,7 +553,7 @@ int hmm_set(ia_css_ptr virt, int c, unsigned int bytes)
vptr = hmm_bo_vmap(bo, true); vptr = hmm_bo_vmap(bo, true);
if (vptr) { if (vptr) {
vptr = vptr + (virt - bo->start); vptr = vptr + (virt - bo->start);
memset((void *)vptr, c, bytes); memset(vptr, c, bytes);
clflush_cache_range(vptr, bytes); clflush_cache_range(vptr, bytes);
hmm_bo_vunmap(bo); hmm_bo_vunmap(bo);
return 0; return 0;