evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] drx-j: remove the useless microcode_size

Browse source 
This var is not used. Remove it from the code, as we'll now be
converting the driver to load the firmware from an external
file.

Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-01-17 16:02:09 -03:00
parent 2f1f733386
commit 9cf5370e31
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/dvb-frontends/drx39xyj/drx_driver.h
View file

@ -1021,8 +1021,6 @@ STRUCTS
struct drxu_code_info { struct drxu_code_info {
u8 *mc_data; u8 *mc_data;
/**< Pointer to microcode image. */ /**< Pointer to microcode image. */
u16 mc_size;
/**< Microcode image size. */
}; };
/** /**
@ -1932,7 +1930,6 @@ struct drx_reg_dump {
struct drx_common_attr { struct drx_common_attr {
/* Microcode (firmware) attributes */ /* Microcode (firmware) attributes */
u8 *microcode; /**< Pointer to microcode image. */ u8 *microcode; /**< Pointer to microcode image. */
u16 microcode_size;
/**< Size of microcode image in bytes. */ /**< Size of microcode image in bytes. */
bool verify_microcode; bool verify_microcode;
/**< Use microcode verify or not. */ /**< Use microcode verify or not. */
@ -2351,7 +2348,6 @@ Access macros
#define DRX_ATTR_CACHESTANDARD(d) ((d)->my_common_attr->di_cache_standard) #define DRX_ATTR_CACHESTANDARD(d) ((d)->my_common_attr->di_cache_standard)
#define DRX_ATTR_CURRENTCHANNEL(d) ((d)->my_common_attr->current_channel) #define DRX_ATTR_CURRENTCHANNEL(d) ((d)->my_common_attr->current_channel)
#define DRX_ATTR_MICROCODE(d) ((d)->my_common_attr->microcode) #define DRX_ATTR_MICROCODE(d) ((d)->my_common_attr->microcode)
#define DRX_ATTR_MICROCODESIZE(d) ((d)->my_common_attr->microcode_size)
#define DRX_ATTR_VERIFYMICROCODE(d) ((d)->my_common_attr->verify_microcode) #define DRX_ATTR_VERIFYMICROCODE(d) ((d)->my_common_attr->verify_microcode)
#define DRX_ATTR_CAPABILITIES(d) ((d)->my_common_attr->capabilities) #define DRX_ATTR_CAPABILITIES(d) ((d)->my_common_attr->capabilities)
#define DRX_ATTR_PRODUCTID(d) ((d)->my_common_attr->product_id) #define DRX_ATTR_PRODUCTID(d) ((d)->my_common_attr->product_id)

6
drivers/media/dvb-frontends/drx39xyj/drxj.c
View file

@ -876,7 +876,6 @@ struct i2c_device_addr drxj_default_addr_g = {
*/ */
struct drx_common_attr drxj_default_comm_attr_g = { struct drx_common_attr drxj_default_comm_attr_g = {
(u8 *)NULL, /* ucode ptr */ (u8 *)NULL, /* ucode ptr */
0, /* ucode size */
true, /* ucode verify switch */ true, /* ucode verify switch */
{0}, /* version record */ {0}, /* version record */
@ -12171,7 +12170,6 @@ trouble ?
/* Check if audio microcode is already uploaded */ /* Check if audio microcode is already uploaded */
if (!(ext_attr->flag_aud_mc_uploaded)) { if (!(ext_attr->flag_aud_mc_uploaded)) {
ucode_info.mc_data = common_attr->microcode; ucode_info.mc_data = common_attr->microcode;
ucode_info.mc_size = common_attr->microcode_size;
/* Upload only audio microcode */ /* Upload only audio microcode */
rc = ctrl_u_code_upload(demod, &ucode_info, UCODE_UPLOAD, true); rc = ctrl_u_code_upload(demod, &ucode_info, UCODE_UPLOAD, true);
@ -18846,8 +18844,7 @@ ctrl_u_code_upload(struct drx_demod_instance *demod,
ext_attr = (struct drxj_data *) demod->my_ext_attr; ext_attr = (struct drxj_data *) demod->my_ext_attr;
/* Check arguments */ /* Check arguments */
if ((mc_info == NULL) || if (!mc_info || !mc_info->mc_data) {
(mc_info->mc_data == NULL) || (mc_info->mc_size == 0)) {
return -EINVAL; return -EINVAL;
} }
@ -20147,7 +20144,6 @@ int drxj_open(struct drx_demod_instance *demod)
pretend device is already open */ pretend device is already open */
common_attr->is_opened = true; common_attr->is_opened = true;
ucode_info.mc_data = common_attr->microcode; ucode_info.mc_data = common_attr->microcode;
ucode_info.mc_size = common_attr->microcode_size;
#ifdef DRXJ_SPLIT_UCODE_UPLOAD #ifdef DRXJ_SPLIT_UCODE_UPLOAD
/* Upload microcode without audio part */ /* Upload microcode without audio part */