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

Commit 1881ee89 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7571): mt312: Cleanup buffer variables of read/write functions 



Change type of buffer variables from void* to u8* to save some casts.

Signed-off-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent dbad108b

drivers/media/dvb/frontends/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -369,6 +369,11 @@ config DVB_TUNER_XC5000 
	  This device is only used inside a SiP called togther with a

	  demodulator for now.



config DVB_TUNER_ITD1000

	tristate "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE



comment "Miscellaneous devices"

	depends on DVB_CORE

drivers/media/dvb/frontends/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,3 +52,4 @@ obj-$(CONFIG_DVB_TUA6100) += tua6100.o 
obj-$(CONFIG_DVB_TUNER_MT2131) += mt2131.o

obj-$(CONFIG_DVB_S5H1409) += s5h1409.o

obj-$(CONFIG_DVB_TUNER_XC5000) += xc5000.o

obj-$(CONFIG_DVB_TUNER_ITD1000) += itd1000.o

drivers/media/dvb/frontends/mt312.c

+6 −6
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int debug; 
#define MT312_PLL_CLK		10000000UL	/* 10 MHz */



static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg,

		      void *buf, const size_t count)

		      u8 *buf, const size_t count)

{

	int ret;

	struct i2c_msg msg[2];
@@ -84,7 +84,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, 
		int i;

		dprintk("R(%d):", reg & 0x7f);

		for (i = 0; i < count; i++)

			printk(" %02x", ((const u8 *) buf)[i]);

			printk(" %02x", buf[i]);

		printk("\n");

	}
@@ -92,7 +92,7 @@ static int mt312_read(struct mt312_state *state, const enum mt312_reg_addr reg, 
}



static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg,

		       const void *src, const size_t count)

		       const u8 *src, const size_t count)

{

	int ret;

	u8 buf[count + 1];
@@ -102,7 +102,7 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg, 
		int i;

		dprintk("W(%d):", reg & 0x7f);

		for (i = 0; i < count; i++)

			printk(" %02x", ((const u8 *) src)[i]);

			printk(" %02x", src[i]);

		printk("\n");

	}
@@ -463,7 +463,7 @@ static int mt312_read_snr(struct dvb_frontend *fe, u16 *snr) 
	int ret;

	u8 buf[2];



	ret = mt312_read(state, M_SNR_H, &buf, sizeof(buf));

	ret = mt312_read(state, M_SNR_H, buf, sizeof(buf));

	if (ret < 0)

		return ret;
@@ -478,7 +478,7 @@ static int mt312_read_ucblocks(struct dvb_frontend *fe, u32 *ubc) 
	int ret;

	u8 buf[2];



	ret = mt312_read(state, RS_UBC_H, &buf, sizeof(buf));

	ret = mt312_read(state, RS_UBC_H, buf, sizeof(buf));

	if (ret < 0)

		return ret;