Commit 1c714501 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files

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: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 2d8c98b8

drivers/media/pci/ddbridge/ddbridge-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ static int dvb_input_attach(struct ddb_input *input) 
	dvb->fe2 = NULL;

	switch (port->type) {

	case DDB_TUNER_MXL5XX:

		if (fe_attach_mxl5xx(input) < 0)

		if (ddb_fe_attach_mxl5xx(input) < 0)

			return -ENODEV;

		break;

	case DDB_TUNER_DVBS_ST:
@@ -2955,7 +2955,7 @@ static ssize_t fmode_store(struct device *device, struct device_attribute *attr, 
		return -EINVAL;

	if (val > 3)

		return -EINVAL;

	lnb_init_fmode(dev, &dev->link[num], val);

	ddb_lnb_init_fmode(dev, &dev->link[num], val);

	return count;

}

drivers/media/pci/ddbridge/ddbridge-max.c

+3 −3
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int mxl_fw_read(void *priv, u8 *buf, u32 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;
@@ -404,7 +404,7 @@ static struct mxl5xx_cfg mxl5xx = { 
	.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 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_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.enable_high_lnb_voltage = max_enable_high_lnb_voltage;

drivers/media/pci/ddbridge/ddbridge-max.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


/******************************************************************************/



int lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm);

int fe_attach_mxl5xx(struct ddb_input *input);

int ddb_lnb_init_fmode(struct ddb *dev, struct ddb_link *link, u32 fm);

int ddb_fe_attach_mxl5xx(struct ddb_input *input);



#endif /* _DDBRIDGE_MAX_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE