Skip to content

L
linux
Commit e33f2193 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

[media] drx-j: More CamelCase fixups 

Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 259f380e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 85 deletions
drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
View file @ e33f2193
......@@ -514,13 +514,13 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr,
*/
todo = (block_size < datasize ? block_size : datasize);
if (todo == 0) {
u16 overhead_sizeI2cAddr = 0;
u16 overhead_size_i2c_addr = 0;
u16 data_block_size = 0;
overhead_sizeI2cAddr =
overhead_size_i2c_addr =
(IS_I2C_10BIT(dev_addr->i2c_addr) ? 2 : 1);
data_block_size =
(DRXDAP_MAX_WCHUNKSIZE - overhead_sizeI2cAddr) & ~1;
(DRXDAP_MAX_WCHUNKSIZE - overhead_size_i2c_addr) & ~1;
/* write device address */
st = drxbsp_i2c_write_read(dev_addr,
......
drivers/media/dvb-frontends/drx39xyj/drx_driver.c
View file @ e33f2193
......@@ -294,7 +294,7 @@ scan_prepare_next_scan(struct drx_demod_instance *demod, s32 skip)
/* Search next frequency to scan */
/* always take at least one step */
(common_attr->scan_channelsScanned)++;
(common_attr->scan_channels_scanned)++;
next_frequency += frequency_plan[table_index].step;
skip -= frequency_plan[table_index].step;
......@@ -302,7 +302,7 @@ scan_prepare_next_scan(struct drx_demod_instance *demod, s32 skip)
without exceeding end of the band */
while ((skip > 0) &&
(next_frequency <= frequency_plan[table_index].last)) {
(common_attr->scan_channelsScanned)++;
(common_attr->scan_channels_scanned)++;
next_frequency += frequency_plan[table_index].step;
skip -= frequency_plan[table_index].step;
}
......@@ -528,7 +528,7 @@ ctrl_scan_init(struct drx_demod_instance *demod, struct drx_scan_param *scan_par
/* Store parameters */
common_attr->scan_ready = false;
common_attr->scan_max_channels = nr_channels_in_plan;
common_attr->scan_channelsScanned = 0;
common_attr->scan_channels_scanned = 0;
common_attr->scan_param = scan_param; /* SCAN_NEXT is now allowed */
scan_context = get_scan_context(demod, scan_context);
......@@ -626,7 +626,7 @@ static int ctrl_scan_next(struct drx_demod_instance *demod, u16 *scan_progress)
return DRX_STS_ERROR;
}
*scan_progress = (u16) (((common_attr->scan_channelsScanned) *
*scan_progress = (u16) (((common_attr->scan_channels_scanned) *
((u32) (max_progress))) /
(common_attr->scan_max_channels));
......@@ -682,7 +682,7 @@ static int ctrl_scan_next(struct drx_demod_instance *demod, u16 *scan_progress)
/* keep track of progress */
*scan_progress =
(u16) (((common_attr->scan_channelsScanned) *
(u16) (((common_attr->scan_channels_scanned) *
((u32) (max_progress))) /
(common_attr->scan_max_channels));
......@@ -1119,7 +1119,7 @@ ctrl_u_code(struct drx_demod_instance *demod,
case UCODE_VERIFY:
{
int result = 0;
u8 mc_dataBuffer
u8 mc_data_buffer
[DRX_UCODE_MAX_BUF_SIZE];
u32 bytes_to_compare = 0;
u32 bytes_left_to_compare = 0;
......@@ -1148,7 +1148,7 @@ ctrl_u_code(struct drx_demod_instance *demod,
(u16)
bytes_to_compare,
(u8 *)
mc_dataBuffer,
mc_data_buffer,
0x0000) !=
DRX_STS_OK) {
return DRX_STS_ERROR;
......@@ -1156,7 +1156,7 @@ ctrl_u_code(struct drx_demod_instance *demod,
result =
drxbsp_hst_memcmp(curr_ptr,
mc_dataBuffer,
mc_data_buffer,
bytes_to_compare);
if (result != 0) {
......@@ -1209,7 +1209,7 @@ ctrl_version(struct drx_demod_instance *demod, struct drx_version_list **version
DRX_VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
static struct drx_version drx_driver_core_version;
static struct drx_version_list drx_driver_core_versionList;
static struct drx_version_list drx_driver_core_version_list;
struct drx_version_list *demod_version_list = (struct drx_version_list *) (NULL);
int return_status = DRX_STS_ERROR;
......@@ -1233,8 +1233,8 @@ ctrl_version(struct drx_demod_instance *demod, struct drx_version_list **version
drx_driver_core_version.v_patch = VERSION_PATCH;
drx_driver_core_version.v_string = drx_driver_core_version_text;
drx_driver_core_versionList.version = &drx_driver_core_version;
drx_driver_core_versionList.next = (struct drx_version_list *) (NULL);
drx_driver_core_version_list.version = &drx_driver_core_version;
drx_driver_core_version_list.next = (struct drx_version_list *) (NULL);
if ((return_status == DRX_STS_OK) && (demod_version_list != NULL)) {
/* Append versioninfo from driver to versioninfo from demod */
......@@ -1244,12 +1244,12 @@ ctrl_version(struct drx_demod_instance *demod, struct drx_version_list **version
while (current_list_element->next != NULL) {
current_list_element = current_list_element->next;
}
current_list_element->next = &drx_driver_core_versionList;
current_list_element->next = &drx_driver_core_version_list;
*version_list = demod_version_list;
} else {
/* Just return versioninfo from driver */
*version_list = &drx_driver_core_versionList;
*version_list = &drx_driver_core_version_list;
}
return DRX_STS_OK;
......
drivers/media/dvb-frontends/drx39xyj/drx_driver.h
View file @ e33f2193
......@@ -182,7 +182,7 @@ struct tuner_common {
s32 max_freq_rf; /* Highest RF input frequency, in kHz */
u8 sub_mode; /* Index to sub-mode in use */
char ***sub_modeDescriptions; /* Pointer to description of sub-modes */
char ***sub_mode_descriptions; /* Pointer to description of sub-modes */
u8 sub_modes; /* Number of available sub-modes */
/* The following fields will be either 0, NULL or false and do not need
......@@ -192,7 +192,7 @@ struct tuner_common {
s32 r_ffrequency; /* only valid if programmed */
s32 i_ffrequency; /* only valid if programmed */
void *myUser_data; /* pointer to associated demod instance */
void *my_user_data; /* pointer to associated demod instance */
u16 my_capabilities; /* value for storing application flags */
};
......@@ -230,7 +230,7 @@ struct tuner_ops {
tuner_close_func_t close_func;
tuner_set_frequency_func_t set_frequency_func;
tuner_get_frequency_func_t get_frequency_func;
tuner_lock_status_func_t lock_statusFunc;
tuner_lock_status_func_t lock_status_func;
tune_ri2c_write_read_func_t i2c_write_read_func;
};
......@@ -1985,7 +1985,7 @@ struct drx_reg_dump {
/**< next freq to scan */
bool scan_ready; /**< scan ready flag */
u32 scan_max_channels;/**< number of channels in freqplan */
u32 scan_channelsScanned;
u32 scan_channels_scanned;
/**< number of channels scanned */
/* Channel scan - inner loop: demod related */
drx_scan_func_t scan_function;
......
drivers/media/dvb-frontends/drx39xyj/drxj.c
View file @ e33f2193
This diff is collapsed.
drivers/media/dvb-frontends/drx39xyj/drxj.h
View file @ e33f2193
......@@ -426,7 +426,7 @@ struct drxj_cfg_atv_output {
u8 mfx; /**< metal fix */
/* tuner settings */
bool mirror_freq_spectOOB;/**< tuner inversion (true = tuner mirrors the signal */
bool mirror_freq_spect_oob;/**< tuner inversion (true = tuner mirrors the signal */
/* standard/channel settings */
enum drx_standard standard; /**< current standard information */
......@@ -446,7 +446,7 @@ struct drxj_cfg_atv_output {
u16 fec_rs_prescale; /**< ReedSolomon Measurement Prescale */
u16 fec_rs_period; /**< ReedSolomon Measurement period */
bool reset_pkt_err_acc; /**< Set a flag to reset accumulated packet error */
u16 pkt_errAccStart; /**< Set a flag to reset accumulated packet error */
u16 pkt_err_acc_start; /**< Set a flag to reset accumulated packet error */
/* HI configuration */
u16 hi_cfg_timing_div; /**< HI Configure() parameter 2 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7