Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 113799
b: refs/heads/master
c: 95fc2ea
h: refs/heads/master
i:
  113797: ac6de30
  113795: 2bc1433
  113791: 6eb1a0c
v: v3
  • Loading branch information
Alexander Beregalov authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent 10ad7e6 commit 3316ee0
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 29e66a6ce84abe04bc809ddb35634752881dec79
refs/heads/master: 95fc2ead8406a6d0aa6d8ccf30125f4a50ae323f
34 changes: 17 additions & 17 deletions trunk/drivers/media/dvb/frontends/drx397xD.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static void drx_release_fw(struct drx397xD_state *s)
{
fw_ix_t ix = s->chip_rev;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

write_lock(&fw[ix].lock);
if (fw[ix].refcnt) {
Expand All @@ -113,7 +113,7 @@ static int drx_load_fw(struct drx397xD_state *s, fw_ix_t ix)
size_t size, len;
int i = 0, j, rc = -EINVAL;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

if (ix < 0 || ix >= ARRAY_SIZE(fw))
return -EINVAL;
Expand Down Expand Up @@ -197,10 +197,10 @@ static int write_fw(struct drx397xD_state *s, blob_ix_t ix)
int len, rc = 0, i = 0;

if (ix < 0 || ix >= ARRAY_SIZE(blob_name)) {
pr_debug("%s drx_fw_ix_t out of range\n", __FUNCTION__);
pr_debug("%s drx_fw_ix_t out of range\n", __func__);
return -EINVAL;
}
pr_debug("%s %s\n", __FUNCTION__, blob_name[ix]);
pr_debug("%s %s\n", __func__, blob_name[ix]);

read_lock(&fw[s->chip_rev].lock);
data = fw[s->chip_rev].data[ix];
Expand Down Expand Up @@ -305,7 +305,7 @@ static int PLL_Set(struct drx397xD_state *s,
u32 f_tuner, f = fep->frequency;
int rc;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

if ((f > s->frontend.ops.tuner_ops.info.frequency_max) ||
(f < s->frontend.ops.tuner_ops.info.frequency_min))
Expand All @@ -325,7 +325,7 @@ static int PLL_Set(struct drx397xD_state *s,
return rc;

*df_tuner = f_tuner - f;
pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __FUNCTION__, f,
pr_debug("%s requested %d [Hz] tuner %d [Hz]\n", __func__, f,
f_tuner);

return 0;
Expand All @@ -340,7 +340,7 @@ static int SC_WaitForReady(struct drx397xD_state *s)
int cnt = 1000;
int rc;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

while (cnt--) {
rc = RD16(s, 0x820043);
Expand All @@ -354,7 +354,7 @@ static int SC_SendCommand(struct drx397xD_state *s, int cmd)
{
int rc;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

WR16(s, 0x820043, cmd);
SC_WaitForReady(s);
Expand All @@ -368,7 +368,7 @@ static int HI_Command(struct drx397xD_state *s, u16 cmd)
{
int rc, cnt = 1000;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

rc = WR16(s, 0x420032, cmd);
if (rc < 0)
Expand All @@ -389,7 +389,7 @@ static int HI_Command(struct drx397xD_state *s, u16 cmd)
static int HI_CfgCommand(struct drx397xD_state *s)
{

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

WR16(s, 0x420033, 0x3973);
WR16(s, 0x420034, s->config.w50); // code 4, log 4
Expand Down Expand Up @@ -419,7 +419,7 @@ static int SetCfgIfAgc(struct drx397xD_state *s, struct drx397xD_CfgIfAgc *agc)
u16 w0C = agc->w0C;
int quot, rem, i, rc = -EINVAL;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

if (agc->w04 > 0x3ff)
goto exit_rc;
Expand Down Expand Up @@ -478,7 +478,7 @@ static int SetCfgRfAgc(struct drx397xD_state *s, struct drx397xD_CfgRfAgc *agc)
u16 w06 = agc->w06;
int rc = -1;

pr_debug("%s %d 0x%x 0x%x\n", __FUNCTION__, agc->d00, w04, w06);
pr_debug("%s %d 0x%x 0x%x\n", __func__, agc->d00, w04, w06);

if (w04 > 0x3ff)
goto exit_rc;
Expand Down Expand Up @@ -554,7 +554,7 @@ static int CorrectSysClockDeviation(struct drx397xD_state *s)
int lockstat;
u32 clk, clk_limit;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

if (s->config.d5C == 0) {
EXIT_RC(WR16(s, 0x08200e8, 0x010));
Expand Down Expand Up @@ -598,7 +598,7 @@ static int CorrectSysClockDeviation(struct drx397xD_state *s)

if (clk - s->config.f_osc * 1000 + clk_limit <= 2 * clk_limit) {
s->f_osc = clk;
pr_debug("%s: osc %d %d [Hz]\n", __FUNCTION__,
pr_debug("%s: osc %d %d [Hz]\n", __func__,
s->config.f_osc * 1000, clk - s->config.f_osc * 1000);
}
rc = WR16(s, 0x08200e8, 0);
Expand All @@ -610,7 +610,7 @@ static int ConfigureMPEGOutput(struct drx397xD_state *s, int type)
{
int rc, si, bp;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

si = s->config.wA0;
if (s->config.w98 == 0) {
Expand Down Expand Up @@ -646,7 +646,7 @@ static int drx_tune(struct drx397xD_state *s,

int rc, df_tuner;
int a, b, c, d;
pr_debug("%s %d\n", __FUNCTION__, s->config.d60);
pr_debug("%s %d\n", __func__, s->config.d60);

if (s->config.d60 != 2)
goto set_tuner;
Expand Down Expand Up @@ -1082,7 +1082,7 @@ static int drx397x_init(struct dvb_frontend *fe)
struct drx397xD_state *s = fe->demodulator_priv;
int rc;

pr_debug("%s\n", __FUNCTION__);
pr_debug("%s\n", __func__);

s->config.rfagc.d00 = 2; /* 0x7c */
s->config.rfagc.w04 = 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/frontends/drx397xD.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ extern struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config
static inline struct dvb_frontend* drx397xD_attach(const struct drx397xD_config *config,
struct i2c_adapter *i2c)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif /* CONFIG_DVB_DRX397XD */
Expand Down

0 comments on commit 3316ee0

Please sign in to comment.