renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

[media] drx-j: get rid of its own be??_to_cpu() implementation

Browse Source 
Instead of handling endiannes with its own internal way, use the
already existing macros.

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-19 10:06:43 -03:00
parent e2b8e8d241
commit d0b2519e04
1 changed files with 16 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
drivers/media/dvb-frontends/drx39xyj/drx_driver.c
View File

@ -133,62 +133,8 @@ struct drxu_code_block_hdr {
FUNCTIONS
------------------------------------------------------------------------------*/
/*============================================================================*/
/*============================================================================*/
/*===Microcode related functions==============================================*/
/*============================================================================*/
/*============================================================================*/
/**
* \brief Read a 16 bits word, expects big endian data.
* \param addr: Pointer to memory from which to read the 16 bits word.
* \return u16 The data read.
*
* This function takes care of the possible difference in endianness between the
* host and the data contained in the microcode image file.
*
*/
static u16 u_code_read16(u8 *addr)
{
/* Works fo any host processor */
u16 word = 0;
word = ((u16) addr[0]);
word <<= 8;
word |= ((u16) addr[1]);
return word;
}
/*============================================================================*/
/**
* \brief Read a 32 bits word, expects big endian data.
* \param addr: Pointer to memory from which to read the 32 bits word.
* \return u32 The data read.
*
* This function takes care of the possible difference in endianness between the
* host and the data contained in the microcode image file.
*
*/
static u32 u_code_read32(u8 *addr)
{
/* Works fo any host processor */
u32 word = 0;
word = ((u16) addr[0]);
word <<= 8;
word |= ((u16) addr[1]);
word <<= 8;
word |= ((u16) addr[2]);
word <<= 8;
word |= ((u16) addr[3]);
return word;
}
/*============================================================================*/
/**
@ -205,7 +151,7 @@ static u16 u_code_compute_crc(u8 *block_data, u16 nr_words)
u32 carry = 0;
while (i < nr_words) {
crc_word |= (u32) u_code_read16(block_data);
crc_word |= (u32) be16_to_cpu(*(u32 *)(block_data));
for (j = 0; j < 16; j++) {
crc_word <<= 1;
if (carry != 0)
@ -228,7 +174,7 @@ static int check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
int i;
unsigned count = 2 * sizeof(u16);
u32 mc_dev_type, mc_version, mc_base_version;
u16 mc_nr_of_blks = u_code_read16(mc_data + sizeof(u16));
u16 mc_nr_of_blks = be16_to_cpu(*(u32 *)(mc_data + sizeof(u16)));
/*
* Scan microcode blocks first for version info
@ -246,13 +192,13 @@ static int check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
goto eof;
/* Process block header */
block_hdr.addr = u_code_read32(mc_data + count);
block_hdr.addr = be32_to_cpu(*(u32 *)(mc_data + count));
count += sizeof(u32);
block_hdr.size = u_code_read16(mc_data + count);
block_hdr.size = be16_to_cpu(*(u32 *)(mc_data + count));
count += sizeof(u16);
block_hdr.flags = u_code_read16(mc_data + count);
block_hdr.flags = be16_to_cpu(*(u32 *)(mc_data + count));
count += sizeof(u16);
block_hdr.CRC = u_code_read16(mc_data + count);
block_hdr.CRC = be16_to_cpu(*(u32 *)(mc_data + count));
count += sizeof(u16);
pr_debug("%u: addr %u, size %u, flags 0x%04x, CRC 0x%04x\n",
@ -266,7 +212,7 @@ static int check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
if (block_hdr.addr + sizeof(u16) > size)
goto eof;
auxtype = u_code_read16(auxblk);
auxtype = be16_to_cpu(*(u32 *)(auxblk));
/* Aux block. Check type */
if (DRX_ISMCVERTYPE(auxtype)) {
@ -274,11 +220,11 @@ static int check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
goto eof;
auxblk += sizeof(u16);
mc_dev_type = u_code_read32(auxblk);
mc_dev_type = be32_to_cpu(*(u32 *)(auxblk));
auxblk += sizeof(u32);
mc_version = u_code_read32(auxblk);
mc_version = be32_to_cpu(*(u32 *)(auxblk));
auxblk += sizeof(u32);
mc_base_version = u_code_read32(auxblk);
mc_base_version = be32_to_cpu(*(u32 *)(auxblk));
DRX_ATTR_MCRECORD(demod).aux_type = auxtype;
DRX_ATTR_MCRECORD(demod).mc_dev_type = mc_dev_type;
@ -361,9 +307,9 @@ ctrl_u_code(struct drx_demod_instance *demod,
mc_data = (void *)mc_data_init;
/* Check data */
mc_magic_word = u_code_read16(mc_data);
mc_magic_word = be16_to_cpu(*(u32 *)(mc_data));
mc_data += sizeof(u16);
mc_nr_of_blks = u_code_read16(mc_data);
mc_nr_of_blks = be16_to_cpu(*(u32 *)(mc_data));
mc_data += sizeof(u16);
if ((mc_magic_word != DRX_UCODE_MAGIC_WORD) || (mc_nr_of_blks == 0)) {
@ -396,13 +342,13 @@ ctrl_u_code(struct drx_demod_instance *demod,
u16 mc_block_nr_bytes = 0;
/* Process block header */
block_hdr.addr = u_code_read32(mc_data);
block_hdr.addr = be32_to_cpu(*(u32 *)(mc_data));
mc_data += sizeof(u32);
block_hdr.size = u_code_read16(mc_data);
block_hdr.size = be16_to_cpu(*(u32 *)(mc_data));
mc_data += sizeof(u16);
block_hdr.flags = u_code_read16(mc_data);
block_hdr.flags = be16_to_cpu(*(u32 *)(mc_data));
mc_data += sizeof(u16);
block_hdr.CRC = u_code_read16(mc_data);
block_hdr.CRC = be16_to_cpu(*(u32 *)(mc_data));
mc_data += sizeof(u16);
pr_debug("%u: addr %u, size %u, flags 0x%04x, CRC 0x%04x\n",