Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3037fd14 authored by Ben Hutchings's avatar Ben Hutchings Committed by Mauro Carvalho Chehab
Browse files

[media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits 



This function is declared extern and exported, and should not be given
a generic name which may conflict with gpiolib in future.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a22407fa

drivers/media/dvb/mantis/hopper_vp3028.c

+2 −2
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ static int vp3028_frontend_init(struct mantis_pci *mantis, struct dvb_frontend * 
	struct mantis_hwconfig *config	= mantis->hwconfig;

	int err = 0;



	gpio_set_bits(mantis, config->reset, 0);

	mantis_gpio_set_bits(mantis, config->reset, 0);

	msleep(100);

	err = mantis_frontend_power(mantis, POWER_ON);

	msleep(100);

	gpio_set_bits(mantis, config->reset, 1);

	mantis_gpio_set_bits(mantis, config->reset, 1);



	err = mantis_frontend_power(mantis, POWER_ON);

	if (err == 0) {

drivers/media/dvb/mantis/mantis_dvb.c

+7 −7
Original line number Diff line number Diff line
@@ -47,15 +47,15 @@ int mantis_frontend_power(struct mantis_pci *mantis, enum mantis_power power) 
	switch (power) {

	case POWER_ON:

		dprintk(MANTIS_DEBUG, 1, "Power ON");

		gpio_set_bits(mantis, config->power, POWER_ON);

		mantis_gpio_set_bits(mantis, config->power, POWER_ON);

		msleep(100);

		gpio_set_bits(mantis, config->power, POWER_ON);

		mantis_gpio_set_bits(mantis, config->power, POWER_ON);

		msleep(100);

		break;



	case POWER_OFF:

		dprintk(MANTIS_DEBUG, 1, "Power OFF");

		gpio_set_bits(mantis, config->power, POWER_OFF);

		mantis_gpio_set_bits(mantis, config->power, POWER_OFF);

		msleep(100);

		break;
@@ -73,13 +73,13 @@ void mantis_frontend_soft_reset(struct mantis_pci *mantis) 
	struct mantis_hwconfig *config = mantis->hwconfig;



	dprintk(MANTIS_DEBUG, 1, "Frontend RESET");

	gpio_set_bits(mantis, config->reset, 0);

	mantis_gpio_set_bits(mantis, config->reset, 0);

	msleep(100);

	gpio_set_bits(mantis, config->reset, 0);

	mantis_gpio_set_bits(mantis, config->reset, 0);

	msleep(100);

	gpio_set_bits(mantis, config->reset, 1);

	mantis_gpio_set_bits(mantis, config->reset, 1);

	msleep(100);

	gpio_set_bits(mantis, config->reset, 1);

	mantis_gpio_set_bits(mantis, config->reset, 1);

	msleep(100);



	return;

drivers/media/dvb/mantis/mantis_ioc.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int mantis_get_mac(struct mantis_pci *mantis) 
EXPORT_SYMBOL_GPL(mantis_get_mac);



/* Turn the given bit on or off. */

void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)

void mantis_gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)

{

	u32 cur;
@@ -90,7 +90,7 @@ void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value) 
	mmwrite(mantis->gpio_status, MANTIS_GPIF_ADDR);

	mmwrite(0x00, MANTIS_GPIF_DOUT);

}

EXPORT_SYMBOL_GPL(gpio_set_bits);

EXPORT_SYMBOL_GPL(mantis_gpio_set_bits);



int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl)

{

drivers/media/dvb/mantis/mantis_ioc.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ enum mantis_stream_control { 
};



extern int mantis_get_mac(struct mantis_pci *mantis);

extern void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value);

extern void mantis_gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value);



extern int mantis_stream_control(struct mantis_pci *mantis, enum mantis_stream_control stream_ctl);

drivers/media/dvb/mantis/mantis_vp1034.c

+4 −4
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) 
	switch (voltage) {

	case SEC_VOLTAGE_13:

		dprintk(MANTIS_ERROR, 1, "Polarization=[13V]");

		gpio_set_bits(mantis, 13, 1);

		gpio_set_bits(mantis, 14, 0);

		mantis_gpio_set_bits(mantis, 13, 1);

		mantis_gpio_set_bits(mantis, 14, 0);

		break;

	case SEC_VOLTAGE_18:

		dprintk(MANTIS_ERROR, 1, "Polarization=[18V]");

		gpio_set_bits(mantis, 13, 1);

		gpio_set_bits(mantis, 14, 1);

		mantis_gpio_set_bits(mantis, 13, 1);

		mantis_gpio_set_bits(mantis, 14, 1);

		break;

	case SEC_VOLTAGE_OFF:

		dprintk(MANTIS_ERROR, 1, "Frontend (dummy) POWERDOWN");