mirror of
https://github.com/torvalds/linux.git
synced 2026-06-04 12:35:52 +02:00
media: ttpci: coding style fixes: whitespace and newlines
This patch fixes the following checkpatch warnings and errors:
ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
ERROR:SPACING: space prohibited after that open parenthesis '('
ERROR:SPACING: space prohibited before that close parenthesis ')'
ERROR:SPACING: space prohibited before that ',' (ctx:WxW)
ERROR:SPACING: space required after that ',' (ctx:VxV)
ERROR:SPACING: space required before that '-' (ctx:OxV)
ERROR:SPACING: space required before the open parenthesis '('
ERROR:SPACING: spaces required around that '!=' (ctx:VxO)
ERROR:SPACING: spaces required around that '<' (ctx:VxV)
ERROR:SPACING: spaces required around that '=' (ctx:VxV)
ERROR:SPACING: spaces required around that '>=' (ctx:VxV)
WARNING:SPACING: space prohibited between function name and open parenthesis '('
WARNING:TABSTOP: Statements should start on a tabstop
WARNING:LEADING_SPACE: please, no spaces at the start of a line
WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements
WARNING:LINE_SPACING: Missing a blank line after declarations
Signed-off-by: Stefan Herdler <herdler@nurfuerspam.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Stefan Herdler
Hans Verkuil
parent
f1411be046
commit
a5bc649b1e
|
|
@ -95,12 +95,12 @@ static u8 i2c_readreg(struct i2c_adapter *i2c, u8 id, u8 reg)
|
|||
return mm2[0];
|
||||
}
|
||||
|
||||
static int i2c_readregs(struct i2c_adapter *i2c, u8 id, u8 reg, u8 * buf, u8 len)
|
||||
static int i2c_readregs(struct i2c_adapter *i2c, u8 id, u8 reg, u8 *buf, u8 len)
|
||||
{
|
||||
u8 mm1[] = { reg };
|
||||
struct i2c_msg msgs[2] = {
|
||||
{.addr = id / 2,.flags = 0,.buf = mm1,.len = 1},
|
||||
{.addr = id / 2,.flags = I2C_M_RD,.buf = buf,.len = len}
|
||||
{.addr = id / 2, .flags = 0, .buf = mm1, .len = 1},
|
||||
{.addr = id / 2, .flags = I2C_M_RD, .buf = buf, .len = len}
|
||||
};
|
||||
|
||||
if (i2c_transfer(i2c, msgs, 2) != 2)
|
||||
|
|
@ -492,7 +492,7 @@ static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe)
|
|||
u32 div;
|
||||
u8 buf[4];
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
|
||||
struct i2c_msg msg = {.addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
|
||||
|
||||
if ((c->frequency < 950000) || (c->frequency > 2150000))
|
||||
return -EINVAL;
|
||||
|
|
@ -606,7 +606,7 @@ static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe)
|
|||
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
u8 buf[6];
|
||||
struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
|
||||
struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf) };
|
||||
int i;
|
||||
|
||||
#define CU1216_IF 36125000
|
||||
|
|
@ -670,7 +670,7 @@ static int philips_tu1216_tuner_init(struct dvb_frontend *fe)
|
|||
{
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };
|
||||
struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
|
||||
struct i2c_msg tuner_msg = {.addr = 0x60, .flags = 0, .buf = tu1216_init, .len = sizeof(tu1216_init) };
|
||||
|
||||
// setup PLL configuration
|
||||
if (fe->ops.i2c_gate_ctrl)
|
||||
|
|
@ -687,7 +687,7 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe)
|
|||
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
u8 tuner_buf[4];
|
||||
struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,.len =
|
||||
struct i2c_msg tuner_msg = {.addr = 0x60, .flags = 0, .buf = tuner_buf, .len =
|
||||
sizeof(tuner_buf) };
|
||||
int tuner_frequency = 0;
|
||||
u8 band, cp, filter;
|
||||
|
|
@ -865,7 +865,7 @@ static int philips_sd1878_ci_set_symbol_rate(struct dvb_frontend *fe,
|
|||
|
||||
static const struct stv0299_config philips_sd1878_config = {
|
||||
.demod_address = 0x68,
|
||||
.inittab = philips_sd1878_inittab,
|
||||
.inittab = philips_sd1878_inittab,
|
||||
.mclk = 88000000UL,
|
||||
.invert = 0,
|
||||
.skip_reinit = 0,
|
||||
|
|
@ -1153,8 +1153,8 @@ static u8 read_pwm(struct budget_av *budget_av)
|
|||
{
|
||||
u8 b = 0xff;
|
||||
u8 pwm;
|
||||
struct i2c_msg msg[] = { {.addr = 0x50,.flags = 0,.buf = &b,.len = 1},
|
||||
{.addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1}
|
||||
struct i2c_msg msg[] = { {.addr = 0x50, .flags = 0, .buf = &b, .len = 1},
|
||||
{.addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1}
|
||||
};
|
||||
|
||||
if ((i2c_transfer(&budget_av->budget.i2c_adap, msg, 2) != 2)
|
||||
|
|
@ -1196,8 +1196,8 @@ static u8 read_pwm(struct budget_av *budget_av)
|
|||
|
||||
static void frontend_init(struct budget_av *budget_av)
|
||||
{
|
||||
struct saa7146_dev * saa = budget_av->budget.dev;
|
||||
struct dvb_frontend * fe = NULL;
|
||||
struct saa7146_dev *saa = budget_av->budget.dev;
|
||||
struct dvb_frontend *fe = NULL;
|
||||
|
||||
/* Enable / PowerON Frontend */
|
||||
saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTLO);
|
||||
|
|
@ -1351,7 +1351,7 @@ static void frontend_init(struct budget_av *budget_av)
|
|||
}
|
||||
|
||||
|
||||
static void budget_av_irq(struct saa7146_dev *dev, u32 * isr)
|
||||
static void budget_av_irq(struct saa7146_dev *dev, u32 *isr)
|
||||
{
|
||||
struct budget_av *budget_av = dev->ext_priv;
|
||||
|
||||
|
|
@ -1532,8 +1532,8 @@ static struct saa7146_ext_vv vv_data = {
|
|||
static struct saa7146_extension budget_extension;
|
||||
|
||||
MAKE_BUDGET_INFO(knc1s, "KNC1 DVB-S", BUDGET_KNC1S);
|
||||
MAKE_BUDGET_INFO(knc1s2,"KNC1 DVB-S2", BUDGET_KNC1S2);
|
||||
MAKE_BUDGET_INFO(sates2,"Satelco EasyWatch DVB-S2", BUDGET_KNC1S2);
|
||||
MAKE_BUDGET_INFO(knc1s2, "KNC1 DVB-S2", BUDGET_KNC1S2);
|
||||
MAKE_BUDGET_INFO(sates2, "Satelco EasyWatch DVB-S2", BUDGET_KNC1S2);
|
||||
MAKE_BUDGET_INFO(knc1c, "KNC1 DVB-C", BUDGET_KNC1C);
|
||||
MAKE_BUDGET_INFO(knc1t, "KNC1 DVB-T", BUDGET_KNC1T);
|
||||
MAKE_BUDGET_INFO(kncxs, "KNC TV STAR DVB-S", BUDGET_TVSTAR);
|
||||
|
|
|
|||
|
|
@ -551,7 +551,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)
|
|||
saa7146_write(saa, MC1, MASK_27);
|
||||
}
|
||||
|
||||
static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)
|
||||
static void budget_ci_irq(struct saa7146_dev *dev, u32 *isr)
|
||||
{
|
||||
struct budget_ci *budget_ci = dev->ext_priv;
|
||||
|
||||
|
|
@ -651,7 +651,7 @@ static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe)
|
|||
struct budget_ci *budget_ci = fe->dvb->priv;
|
||||
u32 div;
|
||||
u8 buf[4];
|
||||
struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
|
||||
struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf) };
|
||||
|
||||
if ((p->frequency < 950000) || (p->frequency > 2150000))
|
||||
return -EINVAL;
|
||||
|
|
@ -701,7 +701,7 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)
|
|||
struct budget_ci *budget_ci = fe->dvb->priv;
|
||||
static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab };
|
||||
static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 };
|
||||
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,.flags = 0,.buf = td1316_init,.len =
|
||||
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address, .flags = 0, .buf = td1316_init, .len =
|
||||
sizeof(td1316_init) };
|
||||
|
||||
// setup PLL configuration
|
||||
|
|
@ -731,7 +731,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
|
|||
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
|
||||
struct budget_ci *budget_ci = fe->dvb->priv;
|
||||
u8 tuner_buf[4];
|
||||
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,.flags = 0,.buf = tuner_buf,.len = sizeof(tuner_buf) };
|
||||
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address, .flags = 0, .buf = tuner_buf, .len = sizeof(tuner_buf) };
|
||||
int tuner_frequency = 0;
|
||||
u8 band, cp, filter;
|
||||
|
||||
|
|
@ -1427,8 +1427,8 @@ static void frontend_init(struct budget_ci *budget_ci)
|
|||
budget_ci->budget.dvb_frontend = NULL;
|
||||
}
|
||||
} else {
|
||||
dvb_frontend_detach(budget_ci->budget.dvb_frontend);
|
||||
budget_ci->budget.dvb_frontend = NULL;
|
||||
dvb_frontend_detach(budget_ci->budget.dvb_frontend);
|
||||
budget_ci->budget.dvb_frontend = NULL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -1538,7 +1538,7 @@ static const struct pci_device_id pci_tbl[] = {
|
|||
MAKE_EXTENSION_PCI(ttbs1500b, 0x13c2, 0x101b),
|
||||
{
|
||||
.vendor = 0,
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, pci_tbl);
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ static int start_ts_capture(struct budget *budget)
|
|||
* Pitch: 188, NumBytes3: 188, NumLines3: 1024
|
||||
*/
|
||||
|
||||
switch(budget->card->type) {
|
||||
switch (budget->card->type) {
|
||||
case BUDGET_FS_ACTIVY:
|
||||
saa7146_write(dev, DD1_INIT, 0x04000000);
|
||||
saa7146_write(dev, MC2, (MASK_09 | MASK_25));
|
||||
|
|
@ -423,7 +423,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
|
|||
budget->card = bi;
|
||||
budget->dev = (struct saa7146_dev *) dev;
|
||||
|
||||
switch(budget->card->type) {
|
||||
switch (budget->card->type) {
|
||||
case BUDGET_FS_ACTIVY:
|
||||
budget->buffer_width = TS_WIDTH_ACTIVY;
|
||||
max_bufsize = TS_MAX_BUFSIZE_K_ACTIVY;
|
||||
|
|
@ -568,7 +568,7 @@ int ttpci_budget_deinit(struct budget *budget)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr)
|
||||
void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 *isr)
|
||||
{
|
||||
struct budget *budget = dev->ext_priv;
|
||||
|
||||
|
|
|
|||
|
|
@ -42,9 +42,10 @@ MODULE_PARM_DESC(diseqc_method, "Select DiSEqC method for subsystem id 13c2:1003
|
|||
|
||||
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
|
||||
|
||||
static void Set22K (struct budget *budget, int state)
|
||||
static void Set22K(struct budget *budget, int state)
|
||||
{
|
||||
struct saa7146_dev *dev=budget->dev;
|
||||
struct saa7146_dev *dev = budget->dev;
|
||||
|
||||
dprintk(2, "budget: %p\n", budget);
|
||||
saa7146_setgpio(dev, 3, (state ? SAA7146_GPIO_OUTHI : SAA7146_GPIO_OUTLO));
|
||||
}
|
||||
|
|
@ -53,9 +54,10 @@ static void Set22K (struct budget *budget, int state)
|
|||
/* taken from the Skyvision DVB driver by
|
||||
Ralph Metzler <rjkm@metzlerbros.de> */
|
||||
|
||||
static void DiseqcSendBit (struct budget *budget, int data)
|
||||
static void DiseqcSendBit(struct budget *budget, int data)
|
||||
{
|
||||
struct saa7146_dev *dev=budget->dev;
|
||||
struct saa7146_dev *dev = budget->dev;
|
||||
|
||||
dprintk(2, "budget: %p\n", budget);
|
||||
|
||||
saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
|
||||
|
|
@ -64,13 +66,13 @@ static void DiseqcSendBit (struct budget *budget, int data)
|
|||
udelay(data ? 1000 : 500);
|
||||
}
|
||||
|
||||
static void DiseqcSendByte (struct budget *budget, int data)
|
||||
static void DiseqcSendByte(struct budget *budget, int data)
|
||||
{
|
||||
int i, par=1, d;
|
||||
int i, par = 1, d;
|
||||
|
||||
dprintk(2, "budget: %p\n", budget);
|
||||
|
||||
for (i=7; i>=0; i--) {
|
||||
for (i = 7; i >= 0; i--) {
|
||||
d = (data>>i)&1;
|
||||
par ^= d;
|
||||
DiseqcSendBit(budget, d);
|
||||
|
|
@ -79,9 +81,9 @@ static void DiseqcSendByte (struct budget *budget, int data)
|
|||
DiseqcSendBit(budget, par);
|
||||
}
|
||||
|
||||
static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long burst)
|
||||
static int SendDiSEqCMsg(struct budget *budget, int len, u8 *msg, unsigned long burst)
|
||||
{
|
||||
struct saa7146_dev *dev=budget->dev;
|
||||
struct saa7146_dev *dev = budget->dev;
|
||||
int i;
|
||||
|
||||
dprintk(2, "budget: %p\n", budget);
|
||||
|
|
@ -89,12 +91,12 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long
|
|||
saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
|
||||
mdelay(16);
|
||||
|
||||
for (i=0; i<len; i++)
|
||||
for (i = 0; i < len; i++)
|
||||
DiseqcSendByte(budget, msg[i]);
|
||||
|
||||
mdelay(16);
|
||||
|
||||
if (burst!=-1) {
|
||||
if (burst != -1) {
|
||||
if (burst)
|
||||
DiseqcSendByte(budget, 0xff);
|
||||
else {
|
||||
|
|
@ -118,7 +120,7 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long
|
|||
static int SetVoltage_Activy(struct budget *budget,
|
||||
enum fe_sec_voltage voltage)
|
||||
{
|
||||
struct saa7146_dev *dev=budget->dev;
|
||||
struct saa7146_dev *dev = budget->dev;
|
||||
|
||||
dprintk(2, "budget: %p\n", budget);
|
||||
|
||||
|
|
@ -146,7 +148,7 @@ static int siemens_budget_set_voltage(struct dvb_frontend *fe,
|
|||
{
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
|
||||
return SetVoltage_Activy (budget, voltage);
|
||||
return SetVoltage_Activy(budget, voltage);
|
||||
}
|
||||
|
||||
static int budget_set_tone(struct dvb_frontend *fe,
|
||||
|
|
@ -156,11 +158,11 @@ static int budget_set_tone(struct dvb_frontend *fe,
|
|||
|
||||
switch (tone) {
|
||||
case SEC_TONE_ON:
|
||||
Set22K (budget, 1);
|
||||
Set22K(budget, 1);
|
||||
break;
|
||||
|
||||
case SEC_TONE_OFF:
|
||||
Set22K (budget, 0);
|
||||
Set22K(budget, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -170,11 +172,11 @@ static int budget_set_tone(struct dvb_frontend *fe,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int budget_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
|
||||
static int budget_diseqc_send_master_cmd(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd *cmd)
|
||||
{
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
|
||||
SendDiSEqCMsg (budget, cmd->msg_len, cmd->msg, 0);
|
||||
SendDiSEqCMsg(budget, cmd->msg_len, cmd->msg, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -184,7 +186,7 @@ static int budget_diseqc_send_burst(struct dvb_frontend *fe,
|
|||
{
|
||||
struct budget *budget = fe->dvb->priv;
|
||||
|
||||
SendDiSEqCMsg (budget, 0, NULL, minicmd);
|
||||
SendDiSEqCMsg(budget, 0, NULL, minicmd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -220,7 +222,7 @@ static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)
|
|||
|
||||
if (fe->ops.i2c_gate_ctrl)
|
||||
fe->ops.i2c_gate_ctrl(fe, 1);
|
||||
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -248,7 +250,7 @@ static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)
|
|||
|
||||
if (fe->ops.i2c_gate_ctrl)
|
||||
fe->ops.i2c_gate_ctrl(fe, 1);
|
||||
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -303,7 +305,7 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe)
|
|||
|
||||
if (fe->ops.i2c_gate_ctrl)
|
||||
fe->ops.i2c_gate_ctrl(fe, 1);
|
||||
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -333,7 +335,7 @@ static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)
|
|||
|
||||
if (fe->ops.i2c_gate_ctrl)
|
||||
fe->ops.i2c_gate_ctrl(fe, 1);
|
||||
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -365,7 +367,7 @@ static int s5h1420_tuner_set_params(struct dvb_frontend *fe)
|
|||
|
||||
if (fe->ops.i2c_gate_ctrl)
|
||||
fe->ops.i2c_gate_ctrl(fe, 1);
|
||||
if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
if (i2c_transfer(&budget->i2c_adap, &msg, 1) != 1) return -EIO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -422,12 +424,12 @@ static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg)
|
|||
return (i2c_transfer(i2c, msg, 2) != 2) ? -EIO : val;
|
||||
}
|
||||
|
||||
static u8 read_pwm(struct budget* budget)
|
||||
static u8 read_pwm(struct budget *budget)
|
||||
{
|
||||
u8 b = 0xff;
|
||||
u8 pwm;
|
||||
struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
|
||||
{ .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
|
||||
struct i2c_msg msg[] = { { .addr = 0x50, .flags = 0, .buf = &b, .len = 1 },
|
||||
{ .addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1} };
|
||||
|
||||
if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
|
||||
pwm = 0x48;
|
||||
|
|
@ -478,7 +480,7 @@ static void frontend_init(struct budget *budget)
|
|||
{
|
||||
(void)alps_bsbe1_config; /* avoid warning */
|
||||
|
||||
switch(budget->dev->pci->subsystem_device) {
|
||||
switch (budget->dev->pci->subsystem_device) {
|
||||
case 0x1003: // Hauppauge/TT Nova budget (stv0299/ALPS BSRU6(tsa5059) OR ves1893/ALPS BSRV2(sp5659))
|
||||
case 0x1013:
|
||||
// try the ALPS BSRV2 first of all
|
||||
|
|
@ -642,6 +644,7 @@ static void frontend_init(struct budget *budget)
|
|||
|
||||
case 0x101c: { /* TT S2-1600 */
|
||||
const struct stv6110x_devctl *ctl;
|
||||
|
||||
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
|
||||
msleep(50);
|
||||
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
|
||||
|
|
@ -695,6 +698,7 @@ static void frontend_init(struct budget *budget)
|
|||
|
||||
case 0x1020: { /* Omicom S2 */
|
||||
const struct stv6110x_devctl *ctl;
|
||||
|
||||
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
|
||||
msleep(50);
|
||||
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
|
||||
|
|
@ -769,13 +773,13 @@ static void frontend_init(struct budget *budget)
|
|||
return;
|
||||
}
|
||||
|
||||
static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
|
||||
static int budget_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data *info)
|
||||
{
|
||||
struct budget *budget = NULL;
|
||||
int err;
|
||||
|
||||
budget = kmalloc(sizeof(struct budget), GFP_KERNEL);
|
||||
if( NULL == budget ) {
|
||||
if (NULL == budget) {
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -786,7 +790,7 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
|
|||
err = ttpci_budget_init(budget, dev, info, THIS_MODULE, adapter_nr);
|
||||
if (err) {
|
||||
printk("==> failed\n");
|
||||
kfree (budget);
|
||||
kfree(budget);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
@ -798,7 +802,7 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int budget_detach (struct saa7146_dev* dev)
|
||||
static int budget_detach(struct saa7146_dev *dev)
|
||||
{
|
||||
struct budget *budget = dev->ext_priv;
|
||||
int err;
|
||||
|
|
@ -808,9 +812,9 @@ static int budget_detach (struct saa7146_dev* dev)
|
|||
dvb_frontend_detach(budget->dvb_frontend);
|
||||
}
|
||||
|
||||
err = ttpci_budget_deinit (budget);
|
||||
err = ttpci_budget_deinit(budget);
|
||||
|
||||
kfree (budget);
|
||||
kfree(budget);
|
||||
dev->ext_priv = NULL;
|
||||
|
||||
return err;
|
||||
|
|
@ -839,8 +843,8 @@ static const struct pci_device_id pci_tbl[] = {
|
|||
MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1016),
|
||||
MAKE_EXTENSION_PCI(ttbs1401, 0x13c2, 0x1018),
|
||||
MAKE_EXTENSION_PCI(tt1600, 0x13c2, 0x101c),
|
||||
MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),
|
||||
MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
|
||||
MAKE_EXTENSION_PCI(fsacs1, 0x1131, 0x4f60),
|
||||
MAKE_EXTENSION_PCI(fsacs0, 0x1131, 0x4f61),
|
||||
MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),
|
||||
MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
|
||||
MAKE_EXTENSION_PCI(omicom, 0x14c4, 0x1020),
|
||||
|
|
|
|||
|
|
@ -83,10 +83,10 @@ struct budget {
|
|||
void *priv;
|
||||
};
|
||||
|
||||
#define MAKE_BUDGET_INFO(x_var,x_name,x_type) \
|
||||
#define MAKE_BUDGET_INFO(x_var, x_name, x_type) \
|
||||
static struct budget_info x_var ## _info = { \
|
||||
.name=x_name, \
|
||||
.type=x_type }; \
|
||||
.name = x_name, \
|
||||
.type = x_type }; \
|
||||
static struct saa7146_pci_extension_data x_var = { \
|
||||
.ext_priv = &x_var ## _info, \
|
||||
.ext = &budget_extension };
|
||||
|
|
@ -119,7 +119,7 @@ extern int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
|
|||
struct module *owner, short *adapter_nums);
|
||||
extern void ttpci_budget_init_hooks(struct budget *budget);
|
||||
extern int ttpci_budget_deinit(struct budget *budget);
|
||||
extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr);
|
||||
extern void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 *isr);
|
||||
extern void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port);
|
||||
extern int ttpci_budget_debiread(struct budget *budget, u32 config, int addr, int count,
|
||||
int uselocks, int nobusyloop);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user