Commit b6cdb5be authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab

[media] xc4000: cleanup dmesg logging

Remove some printk() calls added during driver development, and demote some
other messages to debug only (to reduce dmesg chatter).
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 980029eb
...@@ -639,12 +639,6 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -639,12 +639,6 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
int i, best_i = -1, best_nr_matches = 0; int i, best_i = -1, best_nr_matches = 0;
unsigned int type_mask = 0; unsigned int type_mask = 0;
printk("%s called, want type=", __func__);
if (debug) {
dump_firm_type(type);
printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
}
if (!priv->firm) { if (!priv->firm) {
printk("Error! firmware not loaded\n"); printk("Error! firmware not loaded\n");
return -EINVAL; return -EINVAL;
...@@ -715,12 +709,11 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -715,12 +709,11 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
*id = priv->firm[i].id; *id = priv->firm[i].id;
ret: ret:
printk("%s firmware for type=", (i < 0) ? "Can't find" : "Found");
if (debug) { if (debug) {
printk("%s firmware for type=", (i < 0) ? "Can't find" :
"Found");
dump_firm_type(type); dump_firm_type(type);
printk("(%x), id %016llx.\n", type, (unsigned long long)*id); printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
if (i < 0)
dump_stack();
} }
return i; return i;
} }
...@@ -732,19 +725,11 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -732,19 +725,11 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
int pos, rc; int pos, rc;
unsigned char *p; unsigned char *p;
printk("%s called\n", __func__);
pos = seek_firmware(fe, type, id); pos = seek_firmware(fe, type, id);
if (pos < 0) if (pos < 0)
return pos; return pos;
printk("Loading firmware for type=");
// dump_firm_type(priv->firm[pos].type);
printk("(%x), id %016llx.\n", priv->firm[pos].type,
(unsigned long long)*id);
p = priv->firm[pos].ptr; p = priv->firm[pos].ptr;
printk("firmware length = %d\n", priv->firm[pos].size);
/* Don't complain when the request fails because of i2c stretching */ /* Don't complain when the request fails because of i2c stretching */
priv->ignore_i2c_write_errors = 1; priv->ignore_i2c_write_errors = 1;
...@@ -766,8 +751,6 @@ static int xc4000_fwupload(struct dvb_frontend *fe) ...@@ -766,8 +751,6 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
char name[33]; char name[33];
char *fname; char *fname;
printk("%s called\n", __func__);
fname = XC4000_DEFAULT_FIRMWARE; fname = XC4000_DEFAULT_FIRMWARE;
printk("Reading firmware %s\n", fname); printk("Reading firmware %s\n", fname);
...@@ -801,9 +784,9 @@ static int xc4000_fwupload(struct dvb_frontend *fe) ...@@ -801,9 +784,9 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
n_array = get_unaligned_le16(p); n_array = get_unaligned_le16(p);
p += 2; p += 2;
printk("Loading %d firmware images from %s, type: %s, ver %d.%d\n", dprintk(1, "Loading %d firmware images from %s, type: %s, ver %d.%d\n",
n_array, fname, name, n_array, fname, name,
priv->firm_version >> 8, priv->firm_version & 0xff); priv->firm_version >> 8, priv->firm_version & 0xff);
priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL); priv->firm = kzalloc(sizeof(*priv->firm) * n_array, GFP_KERNEL);
if (priv->firm == NULL) { if (priv->firm == NULL) {
...@@ -899,7 +882,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe) ...@@ -899,7 +882,7 @@ static int xc4000_fwupload(struct dvb_frontend *fe)
done: done:
release_firmware(fw); release_firmware(fw);
if (rc == 0) if (rc == 0)
printk("Firmware files loaded.\n"); dprintk(1, "Firmware files loaded.\n");
return rc; return rc;
} }
...@@ -1060,8 +1043,6 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -1060,8 +1043,6 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
goto fail; goto fail;
} }
printk("Done with init1\n");
skip_base: skip_base:
/* /*
* No need to reload standard specific firmware if base firmware * No need to reload standard specific firmware if base firmware
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment