mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 13:43:55 +08:00
V4L/DVB (7241): cx25840: code cleanup
- Use min() - Eliminate extraneous variables Signed-off-by: Tyler Trafford <ttrafford@gmail.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
491215d810
commit
520ebe5f72
@ -79,11 +79,9 @@ static int check_fw_load(struct i2c_client *client, int size)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fw_write(struct i2c_client *client, u8 * data, int size)
|
||||
static int fw_write(struct i2c_client *client, u8 *data, int size)
|
||||
{
|
||||
int sent;
|
||||
|
||||
if ((sent = i2c_master_send(client, data, size)) < size) {
|
||||
if (i2c_master_send(client, data, size) < size) {
|
||||
v4l_err(client, "firmware load i2c failure\n");
|
||||
return -ENOSYS;
|
||||
}
|
||||
@ -96,7 +94,7 @@ int cx25840_loadfw(struct i2c_client *client)
|
||||
struct cx25840_state *state = i2c_get_clientdata(client);
|
||||
const struct firmware *fw = NULL;
|
||||
u8 buffer[4], *ptr;
|
||||
int size, send, retval;
|
||||
int size, retval;
|
||||
|
||||
if (state->is_cx23885)
|
||||
firmware = FWFILE_CX23885;
|
||||
@ -124,8 +122,7 @@ int cx25840_loadfw(struct i2c_client *client)
|
||||
while (size > 0) {
|
||||
ptr[0] = 0x08;
|
||||
ptr[1] = 0x02;
|
||||
send = size > (FWSEND - 2) ? FWSEND : size + 2;
|
||||
retval = fw_write(client, ptr, send);
|
||||
retval = fw_write(client, ptr, min(FWSEND, size + 2));
|
||||
|
||||
if (retval < 0) {
|
||||
release_firmware(fw);
|
||||
|
Loading…
Reference in New Issue
Block a user