iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (7586): radio: use get/put_unaligned_* helpers

Browse Source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Harvey Harrison 2008-04-15 22:22:11 -03:00 committed by Mauro Carvalho Chehab
parent 5b664cb235
commit 5ad6b816e2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/radio/radio-si470x.c
View File

@ -521,8 +521,7 @@ static int si470x_get_register(struct si470x_device *radio, int regnr)
retval = si470x_get_report(radio, (void *) &buf, sizeof(buf)); retval = si470x_get_report(radio, (void *) &buf, sizeof(buf));
if (retval >= 0) if (retval >= 0)
radio->registers[regnr] = be16_to_cpu(get_unaligned( radio->registers[regnr] = get_unaligned_be16(&buf[1]);
(unsigned short *) &buf[1]));
return (retval < 0) ? -EINVAL : 0; return (retval < 0) ? -EINVAL : 0;
} }
@ -537,8 +536,7 @@ static int si470x_set_register(struct si470x_device *radio, int regnr)
int retval; int retval;
buf[0] = REGISTER_REPORT(regnr); buf[0] = REGISTER_REPORT(regnr);
put_unaligned(cpu_to_be16(radio->registers[regnr]), put_unaligned_be16(radio->registers[regnr], &buf[1]);
(unsigned short *) &buf[1]);
retval = si470x_set_report(radio, (void *) &buf, sizeof(buf)); retval = si470x_set_report(radio, (void *) &buf, sizeof(buf));
@ -561,9 +559,8 @@ static int si470x_get_all_registers(struct si470x_device *radio)
if (retval >= 0) if (retval >= 0)
for (regnr = 0; regnr < RADIO_REGISTER_NUM; regnr++) for (regnr = 0; regnr < RADIO_REGISTER_NUM; regnr++)
radio->registers[regnr] = be16_to_cpu(get_unaligned( radio->registers[regnr] = get_unaligned_be16(
(unsigned short *) &buf[regnr * RADIO_REGISTER_SIZE + 1]);
&buf[regnr * RADIO_REGISTER_SIZE + 1]));
return (retval < 0) ? -EINVAL : 0; return (retval < 0) ? -EINVAL : 0;
} }
@ -594,8 +591,7 @@ static int si470x_get_rds_registers(struct si470x_device *radio)
if (retval >= 0) if (retval >= 0)
for (regnr = 0; regnr < RDS_REGISTER_NUM; regnr++) for (regnr = 0; regnr < RDS_REGISTER_NUM; regnr++)
radio->registers[STATUSRSSI + regnr] = radio->registers[STATUSRSSI + regnr] =
be16_to_cpu(get_unaligned((unsigned short *) get_unaligned_be16(&buf[regnr * RADIO_REGISTER_SIZE + 1]);
&buf[regnr * RADIO_REGISTER_SIZE + 1]));
return (retval < 0) ? -EINVAL : 0; return (retval < 0) ? -EINVAL : 0;
} }
@ -843,7 +839,7 @@ static void si470x_rds(struct si470x_device *radio)
}; };
/* Fill the V4L2 RDS buffer */ /* Fill the V4L2 RDS buffer */
put_unaligned(cpu_to_le16(rds), (unsigned short *) &tmpbuf); put_unaligned_le16(rds, &tmpbuf);
tmpbuf[2] = blocknum; /* offset name */ tmpbuf[2] = blocknum; /* offset name */
tmpbuf[2] |= blocknum << 3; /* received offset */ tmpbuf[2] |= blocknum << 3; /* received offset */
if (bler > max_rds_errors) if (bler > max_rds_errors)