Skip to content

L
linux
Commit 0186e434 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] mn88472: rename state to dev 

Rename state to dev.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5ef1ad35
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 71 deletions
drivers/media/dvb-frontends/mn88472.c
View file @ 0186e434
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
static struct dvb_frontend_ops mn88472_ops; static struct dvb_frontend_ops mn88472_ops;
/* write multiple registers */ /* write multiple registers */
static int mn88472_wregs(struct mn88472_state *s, u16 reg, const u8 *val, int len) static int mn88472_wregs(struct mn88472_dev *dev, u16 reg, const u8 *val, int len)
{ {
#define MAX_WR_LEN 21 #define MAX_WR_LEN 21
#define MAX_WR_XFER_LEN (MAX_WR_LEN + 1) #define MAX_WR_XFER_LEN (MAX_WR_LEN + 1)
...@@ -40,11 +40,11 @@ static int mn88472_wregs(struct mn88472_state *s, u16 reg, const u8 *val, int le ...@@ -40,11 +40,11 @@ static int mn88472_wregs(struct mn88472_state *s, u16 reg, const u8 *val, int le
buf[0] = (reg >> 0) & 0xff; buf[0] = (reg >> 0) & 0xff;
memcpy(&buf[1], val, len); memcpy(&buf[1], val, len);
ret = i2c_transfer(s->i2c, msg, 1); ret = i2c_transfer(dev->i2c, msg, 1);
if (ret == 1) { if (ret == 1) {
ret = 0; ret = 0;
} else { } else {
dev_warn(&s->i2c->dev, dev_warn(&dev->i2c->dev,
"%s: i2c wr failed=%d reg=%02x len=%d\n", "%s: i2c wr failed=%d reg=%02x len=%d\n",
KBUILD_MODNAME, ret, reg, len); KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
...@@ -54,7 +54,7 @@ static int mn88472_wregs(struct mn88472_state *s, u16 reg, const u8 *val, int le ...@@ -54,7 +54,7 @@ static int mn88472_wregs(struct mn88472_state *s, u16 reg, const u8 *val, int le
} }
/* read multiple registers */ /* read multiple registers */
static int mn88472_rregs(struct mn88472_state *s, u16 reg, u8 *val, int len) static int mn88472_rregs(struct mn88472_dev *dev, u16 reg, u8 *val, int len)
{ {
#define MAX_RD_LEN 2 #define MAX_RD_LEN 2
#define MAX_RD_XFER_LEN (MAX_RD_LEN) #define MAX_RD_XFER_LEN (MAX_RD_LEN)
...@@ -79,12 +79,12 @@ static int mn88472_rregs(struct mn88472_state *s, u16 reg, u8 *val, int len) ...@@ -79,12 +79,12 @@ static int mn88472_rregs(struct mn88472_state *s, u16 reg, u8 *val, int len)
buf[0] = (reg >> 0) & 0xff; buf[0] = (reg >> 0) & 0xff;
ret = i2c_transfer(s->i2c, msg, 2); ret = i2c_transfer(dev->i2c, msg, 2);
if (ret == 2) { if (ret == 2) {
memcpy(val, buf, len); memcpy(val, buf, len);
ret = 0; ret = 0;
} else { } else {
dev_warn(&s->i2c->dev, dev_warn(&dev->i2c->dev,
"%s: i2c rd failed=%d reg=%02x len=%d\n", "%s: i2c rd failed=%d reg=%02x len=%d\n",
KBUILD_MODNAME, ret, reg, len); KBUILD_MODNAME, ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
...@@ -94,15 +94,15 @@ static int mn88472_rregs(struct mn88472_state *s, u16 reg, u8 *val, int len) ...@@ -94,15 +94,15 @@ static int mn88472_rregs(struct mn88472_state *s, u16 reg, u8 *val, int len)
} }
/* write single register */ /* write single register */
static int mn88472_wreg(struct mn88472_state *s, u16 reg, u8 val) static int mn88472_wreg(struct mn88472_dev *dev, u16 reg, u8 val)
{ {
return mn88472_wregs(s, reg, &val, 1); return mn88472_wregs(dev, reg, &val, 1);
} }
/* read single register */ /* read single register */
static int mn88472_rreg(struct mn88472_state *s, u16 reg, u8 *val) static int mn88472_rreg(struct mn88472_dev *dev, u16 reg, u8 *val)
{ {
return mn88472_rregs(s, reg, val, 1); return mn88472_rregs(dev, reg, val, 1);
} }
static int mn88472_get_tune_settings(struct dvb_frontend *fe, static int mn88472_get_tune_settings(struct dvb_frontend *fe,
...@@ -114,16 +114,16 @@ static int mn88472_get_tune_settings(struct dvb_frontend *fe, ...@@ -114,16 +114,16 @@ static int mn88472_get_tune_settings(struct dvb_frontend *fe,
static int mn88472_set_frontend(struct dvb_frontend *fe) static int mn88472_set_frontend(struct dvb_frontend *fe)
{ {
struct mn88472_state *s = fe->demodulator_priv; struct mn88472_dev *dev = fe->demodulator_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret; int ret;
u32 if_frequency = 0; u32 if_frequency = 0;
dev_dbg(&s->i2c->dev, dev_dbg(&dev->i2c->dev,
"%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d\n", "%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d\n",
__func__, c->delivery_system, c->modulation, __func__, c->delivery_system, c->modulation,
c->frequency, c->symbol_rate, c->inversion); c->frequency, c->symbol_rate, c->inversion);
if (!s->warm) { if (!dev->warm) {
ret = -EAGAIN; ret = -EAGAIN;
goto err; goto err;
} }
...@@ -140,96 +140,96 @@ static int mn88472_set_frontend(struct dvb_frontend *fe) ...@@ -140,96 +140,96 @@ static int mn88472_set_frontend(struct dvb_frontend *fe)
if (ret) if (ret)
goto err; goto err;
dev_dbg(&s->i2c->dev, "%s: get_if_frequency=%d\n", dev_dbg(&dev->i2c->dev, "%s: get_if_frequency=%d\n",
__func__, if_frequency); __func__, if_frequency);
} }
if (if_frequency != 5070000) { if (if_frequency != 5070000) {
dev_err(&s->i2c->dev, "%s: IF frequency %d not supported\n", dev_err(&dev->i2c->dev, "%s: IF frequency %d not supported\n",
KBUILD_MODNAME, if_frequency); KBUILD_MODNAME, if_frequency);
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
ret = mn88472_wregs(s, 0x1c08, "\x1d", 1); ret = mn88472_wregs(dev, 0x1c08, "\x1d", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18d9, "\xe3", 1); ret = mn88472_wregs(dev, 0x18d9, "\xe3", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1c83, "\x01", 1); ret = mn88472_wregs(dev, 0x1c83, "\x01", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1c00, "\x66\x00\x01\x04\x00", 5); ret = mn88472_wregs(dev, 0x1c00, "\x66\x00\x01\x04\x00", 5);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1c10, ret = mn88472_wregs(dev, 0x1c10,
"\x3f\x50\x2c\x8f\x80\x00\x08\xee\x08\xee", 10); "\x3f\x50\x2c\x8f\x80\x00\x08\xee\x08\xee", 10);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1846, "\x00", 1); ret = mn88472_wregs(dev, 0x1846, "\x00", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18ae, "\x00", 1); ret = mn88472_wregs(dev, 0x18ae, "\x00", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18b0, "\x0b", 1); ret = mn88472_wregs(dev, 0x18b0, "\x0b", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18b4, "\x00", 1); ret = mn88472_wregs(dev, 0x18b4, "\x00", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18cd, "\x17", 1); ret = mn88472_wregs(dev, 0x18cd, "\x17", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18d4, "\x09", 1); ret = mn88472_wregs(dev, 0x18d4, "\x09", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x18d6, "\x48", 1); ret = mn88472_wregs(dev, 0x18d6, "\x48", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1a00, "\xb0", 1); ret = mn88472_wregs(dev, 0x1a00, "\xb0", 1);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1cf8, "\x9f", 1); ret = mn88472_wregs(dev, 0x1cf8, "\x9f", 1);
if (ret) if (ret)
goto err; goto err;
s->delivery_system = c->delivery_system; dev->delivery_system = c->delivery_system;
return 0; return 0;
err: err:
dev_dbg(&s->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int mn88472_read_status(struct dvb_frontend *fe, fe_status_t *status) static int mn88472_read_status(struct dvb_frontend *fe, fe_status_t *status)
{ {
struct mn88472_state *s = fe->demodulator_priv; struct mn88472_dev *dev = fe->demodulator_priv;
int ret; int ret;
u8 u8tmp; u8 u8tmp;
*status = 0; *status = 0;
if (!s->warm) { if (!dev->warm) {
ret = -EAGAIN; ret = -EAGAIN;
goto err; goto err;
} }
ret = mn88472_rreg(s, 0x1a84, &u8tmp); ret = mn88472_rreg(dev, 0x1a84, &u8tmp);
if (ret) if (ret)
goto err; goto err;
...@@ -239,62 +239,62 @@ static int mn88472_read_status(struct dvb_frontend *fe, fe_status_t *status) ...@@ -239,62 +239,62 @@ static int mn88472_read_status(struct dvb_frontend *fe, fe_status_t *status)
return 0; return 0;
err: err:
dev_dbg(&s->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int mn88472_init(struct dvb_frontend *fe) static int mn88472_init(struct dvb_frontend *fe)
{ {
struct mn88472_state *s = fe->demodulator_priv; struct mn88472_dev *dev = fe->demodulator_priv;
int ret, len, remaining; int ret, len, remaining;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
u8 *fw_file = MN88472_FIRMWARE; u8 *fw_file = MN88472_FIRMWARE;
dev_dbg(&s->i2c->dev, "%s:\n", __func__); dev_dbg(&dev->i2c->dev, "%s:\n", __func__);
/* set cold state by default */ /* set cold state by default */
s->warm = false; dev->warm = false;
/* power on */ /* power on */
ret = mn88472_wreg(s, 0x1c05, 0x00); ret = mn88472_wreg(dev, 0x1c05, 0x00);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wregs(s, 0x1c0b, "\x00\x00", 2); ret = mn88472_wregs(dev, 0x1c0b, "\x00\x00", 2);
if (ret) if (ret)
goto err; goto err;
/* request the firmware, this will block and timeout */ /* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, s->i2c->dev.parent); ret = request_firmware(&fw, fw_file, dev->i2c->dev.parent);
if (ret) { if (ret) {
dev_err(&s->i2c->dev, "%s: firmare file '%s' not found\n", dev_err(&dev->i2c->dev, "%s: firmare file '%s' not found\n",
KBUILD_MODNAME, fw_file); KBUILD_MODNAME, fw_file);
goto err; goto err;
} }
dev_info(&s->i2c->dev, "%s: downloading firmware from file '%s'\n", dev_info(&dev->i2c->dev, "%s: downloading firmware from file '%s'\n",
KBUILD_MODNAME, fw_file); KBUILD_MODNAME, fw_file);
ret = mn88472_wreg(s, 0x18f5, 0x03); ret = mn88472_wreg(dev, 0x18f5, 0x03);
if (ret) if (ret)
goto err; goto err;
for (remaining = fw->size; remaining > 0; for (remaining = fw->size; remaining > 0;
remaining -= (s->cfg->i2c_wr_max - 1)) { remaining -= (dev->cfg->i2c_wr_max - 1)) {
len = remaining; len = remaining;
if (len > (s->cfg->i2c_wr_max - 1)) if (len > (dev->cfg->i2c_wr_max - 1))
len = (s->cfg->i2c_wr_max - 1); len = (dev->cfg->i2c_wr_max - 1);
ret = mn88472_wregs(s, 0x18f6, ret = mn88472_wregs(dev, 0x18f6,
&fw->data[fw->size - remaining], len); &fw->data[fw->size - remaining], len);
if (ret) { if (ret) {
dev_err(&s->i2c->dev, dev_err(&dev->i2c->dev,
"%s: firmware download failed=%d\n", "%s: firmware download failed=%d\n",
KBUILD_MODNAME, ret); KBUILD_MODNAME, ret);
goto err; goto err;
} }
} }
ret = mn88472_wreg(s, 0x18f5, 0x00); ret = mn88472_wreg(dev, 0x18f5, 0x00);
if (ret) if (ret)
goto err; goto err;
...@@ -302,78 +302,79 @@ static int mn88472_init(struct dvb_frontend *fe) ...@@ -302,78 +302,79 @@ static int mn88472_init(struct dvb_frontend *fe)
fw = NULL; fw = NULL;
/* warm state */ /* warm state */
s->warm = true; dev->warm = true;
return 0; return 0;
err: err:
if (fw) if (fw)
release_firmware(fw); release_firmware(fw);
dev_dbg(&s->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int mn88472_sleep(struct dvb_frontend *fe) static int mn88472_sleep(struct dvb_frontend *fe)
{ {
struct mn88472_state *s = fe->demodulator_priv; struct mn88472_dev *dev = fe->demodulator_priv;
int ret; int ret;
dev_dbg(&s->i2c->dev, "%s:\n", __func__); dev_dbg(&dev->i2c->dev, "%s:\n", __func__);
/* power off */ /* power off */
ret = mn88472_wreg(s, 0x1c0b, 0x30); ret = mn88472_wreg(dev, 0x1c0b, 0x30);
if (ret) if (ret)
goto err; goto err;
ret = mn88472_wreg(s, 0x1c05, 0x3e); ret = mn88472_wreg(dev, 0x1c05, 0x3e);
if (ret) if (ret)
goto err; goto err;
s->delivery_system = SYS_UNDEFINED; dev->delivery_system = SYS_UNDEFINED;
return 0; return 0;
err: err:
dev_dbg(&s->i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&dev->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static void mn88472_release(struct dvb_frontend *fe) static void mn88472_release(struct dvb_frontend *fe)
{ {
struct mn88472_state *s = fe->demodulator_priv; struct mn88472_dev *dev = fe->demodulator_priv;
kfree(s);
kfree(dev);
} }
struct dvb_frontend *mn88472_attach(const struct mn88472_config *cfg, struct dvb_frontend *mn88472_attach(const struct mn88472_config *cfg,
struct i2c_adapter *i2c) struct i2c_adapter *i2c)
{ {
int ret; int ret;
struct mn88472_state *s; struct mn88472_dev *dev;
u8 u8tmp; u8 u8tmp;
dev_dbg(&i2c->dev, "%s:\n", __func__); dev_dbg(&i2c->dev, "%s:\n", __func__);
/* allocate memory for the internal state */ /* allocate memory for the internal state */
s = kzalloc(sizeof(struct mn88472_state), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!s) { if (dev == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
dev_err(&i2c->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME); dev_err(&i2c->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
goto err; goto err;
} }
s->cfg = cfg; dev->cfg = cfg;
s->i2c = i2c; dev->i2c = i2c;
/* check demod responds to I2C */ /* check demod responds to I2C */
ret = mn88472_rreg(s, 0x1c00, &u8tmp); ret = mn88472_rreg(dev, 0x1c00, &u8tmp);
if (ret) if (ret)
goto err; goto err;
/* create dvb_frontend */ /* create dvb_frontend */
memcpy(&s->fe.ops, &mn88472_ops, sizeof(struct dvb_frontend_ops)); memcpy(&dev->fe.ops, &mn88472_ops, sizeof(struct dvb_frontend_ops));
s->fe.demodulator_priv = s; dev->fe.demodulator_priv = dev;
return &s->fe; return &dev->fe;
err: err:
dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
kfree(s); kfree(dev);
return NULL; return NULL;
} }
EXPORT_SYMBOL(mn88472_attach); EXPORT_SYMBOL(mn88472_attach);
......
drivers/media/dvb-frontends/mn88472_priv.h
View file @ 0186e434
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define MN88472_FIRMWARE "dvb-demod-mn88472-02.fw" #define MN88472_FIRMWARE "dvb-demod-mn88472-02.fw"
struct mn88472_state { struct mn88472_dev {
struct i2c_adapter *i2c; struct i2c_adapter *i2c;
const struct mn88472_config *cfg; const struct mn88472_config *cfg;
struct dvb_frontend fe; struct dvb_frontend fe;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7