hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: ddbridge/max: prefix lnb_init_fmode() and fe_attach_mxl5xx() 

Add a ddb_ prefix to the two functions to better avoid conflicts in the
global namespace, ie. when building everything into the kernel image.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Daniel Scheller 2017-10-15 16:51:55 -04:00 committed by Mauro Carvalho Chehab
parent 2d8c98b820
commit 1c71450151
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/ddbridge/ddbridge-core.c
View File

@ -1442,7 +1442,7 @@ static int dvb_input_attach(struct ddb_input *input)
dvb->fe2 = NULL; dvb->fe2 = NULL;
switch (port->type) { switch (port->type) {
case DDB_TUNER_MXL5XX: case DDB_TUNER_MXL5XX:
if (fe_attach_mxl5xx(input) < 0) if (ddb_fe_attach_mxl5xx(input) < 0)
return -ENODEV; return -ENODEV;
break; break;
case DDB_TUNER_DVBS_ST: case DDB_TUNER_DVBS_ST:
@ -2955,7 +2955,7 @@ static ssize_t fmode_store(struct device *device, struct device_attribute *attr,
return -EINVAL; return -EINVAL;
if (val > 3) if (val > 3)
return -EINVAL; return -EINVAL;
lnb_init_fmode(dev, &dev->link[num], val); ddb_lnb_init_fmode(dev, &dev->link[num], val);
return count; return count;
} }

6
drivers/media/pci/ddbridge/ddbridge-max.c
View File

@ -360,7 +360,7 @@ static int mxl_fw_read(void *priv, u8 *buf, u32 len)
return ddbridge_flashread(dev, link->nr, buf, 0xc0000, len); return ddbridge_flashread(dev, link->nr, buf, 0xc0000, len);
} }
int lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm) int ddb_lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm)
{ {
u32 l = link->nr; u32 l = link->nr;
@ -404,7 +404,7 @@ static struct mxl5xx_cfg mxl5xx = {
.fw_read = mxl_fw_read, .fw_read = mxl_fw_read,
}; };
int fe_attach_mxl5xx(struct ddb_input *input) int ddb_fe_attach_mxl5xx(struct ddb_input *input)
{ {
struct ddb *dev = input->port->dev; struct ddb *dev = input->port->dev;
struct i2c_adapter *i2c = &input->port->i2c->adap; struct i2c_adapter *i2c = &input->port->i2c->adap;
@ -440,7 +440,7 @@ int fe_attach_mxl5xx(struct ddb_input *input)
lnb_command(dev, port->lnr, input->nr, LNB_CMD_INIT); lnb_command(dev, port->lnr, input->nr, LNB_CMD_INIT);
lnb_set_voltage(dev, port->lnr, input->nr, SEC_VOLTAGE_OFF); lnb_set_voltage(dev, port->lnr, input->nr, SEC_VOLTAGE_OFF);
} }
lnb_init_fmode(dev, link, fmode); ddb_lnb_init_fmode(dev, link, fmode);
dvb->fe->ops.set_voltage = max_set_voltage; dvb->fe->ops.set_voltage = max_set_voltage;
dvb->fe->ops.enable_high_lnb_voltage = max_enable_high_lnb_voltage; dvb->fe->ops.enable_high_lnb_voltage = max_enable_high_lnb_voltage;

4
drivers/media/pci/ddbridge/ddbridge-max.h
View File

@ -23,7 +23,7 @@
/******************************************************************************/ /******************************************************************************/
int lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm); int ddb_lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm);
int fe_attach_mxl5xx(struct ddb_input *input); int ddb_fe_attach_mxl5xx(struct ddb_input *input);
#endif /* _DDBRIDGE_MAX_H */ #endif /* _DDBRIDGE_MAX_H */