diff options
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c')
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c index 34434557ef65..100a1052dcbc 100644 --- a/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c +++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c @@ -1,21 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mxl111sf-i2c.c - driver for the MaxLinear MXL111SF * - * Copyright (C) 2010 Michael Krufky <mkrufky@kernellabs.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Copyright (C) 2010-2014 Michael Krufky <mkrufky@linuxtv.org> */ #include "mxl111sf-i2c.h" @@ -320,7 +307,7 @@ fail: static int mxl111sf_i2c_send_data(struct mxl111sf_state *state, u8 index, u8 *wdata) { - int ret = mxl111sf_ctrl_msg(state->d, wdata[0], + int ret = mxl111sf_ctrl_msg(state, wdata[0], &wdata[1], 25, NULL, 0); mxl_fail(ret); @@ -330,7 +317,7 @@ static int mxl111sf_i2c_send_data(struct mxl111sf_state *state, static int mxl111sf_i2c_get_data(struct mxl111sf_state *state, u8 index, u8 *wdata, u8 *rdata) { - int ret = mxl111sf_ctrl_msg(state->d, wdata[0], + int ret = mxl111sf_ctrl_msg(state, wdata[0], &wdata[1], 25, rdata, 24); mxl_fail(ret); @@ -520,7 +507,6 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state, data required to program */ block_len = (msg->len / 8); left_over_len = (msg->len % 8); - index = 0; mxl_i2c("block_len %d, left_over_len %d", block_len, left_over_len); @@ -666,8 +652,8 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state, if (rd_status[i] == 0x04) { if (i < 7) { - mxl_i2c("i2c fifo empty!" - " @ %d", i); + mxl_i2c("i2c fifo empty! @ %d", + i); msg->buf[(index*8)+i] = i2c_r_data[(i*3)+1]; /* read again */ @@ -692,8 +678,7 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state, } goto stop_copy; } else { - mxl_i2c("readagain " - "ERROR!"); + mxl_i2c("readagain ERROR!"); } } else { msg->buf[(index*8)+i] = @@ -827,9 +812,8 @@ int mxl111sf_i2c_xfer(struct i2c_adapter *adap, mxl111sf_i2c_hw_xfer_msg(state, &msg[i]) : mxl111sf_i2c_sw_xfer_msg(state, &msg[i]); if (mxl_fail(ret)) { - mxl_debug_adv("failed with error %d on i2c " - "transaction %d of %d, %sing %d bytes " - "to/from 0x%02x", ret, i+1, num, + mxl_debug_adv("failed with error %d on i2c transaction %d of %d, %sing %d bytes to/from 0x%02x", + ret, i+1, num, (msg[i].flags & I2C_M_RD) ? "read" : "writ", msg[i].len, msg[i].addr); @@ -842,9 +826,3 @@ int mxl111sf_i2c_xfer(struct i2c_adapter *adap, return i == num ? num : -EREMOTEIO; } - -/* - * Local variables: - * c-basic-offset: 8 - * End: - */ |