Commit 1b7c3647 authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Linus Torvalds

[PATCH] dvb: cleanup firmware loading printks

- frontends: sp887x: improve confusing firmware loading messages
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6c905335
...@@ -313,7 +313,7 @@ static int sp8870_init (struct dvb_frontend* fe) ...@@ -313,7 +313,7 @@ static int sp8870_init (struct dvb_frontend* fe)
/* request the firmware, this will block until someone uploads it */ /* request the firmware, this will block until someone uploads it */
printk("sp8870: waiting for firmware upload...\n"); printk("sp8870: waiting for firmware upload (%s)...\n", SP8870_DEFAULT_FIRMWARE);
if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) { if (state->config->request_firmware(fe, &fw, SP8870_DEFAULT_FIRMWARE)) {
printk("sp8870: no firmware upload (timeout or file not found?)\n"); printk("sp8870: no firmware upload (timeout or file not found?)\n");
release_firmware(fw); release_firmware(fw);
...@@ -325,6 +325,7 @@ static int sp8870_init (struct dvb_frontend* fe) ...@@ -325,6 +325,7 @@ static int sp8870_init (struct dvb_frontend* fe)
release_firmware(fw); release_firmware(fw);
return -EIO; return -EIO;
} }
printk("sp8870: firmware upload complete\n");
/* enable TS output and interface pins */ /* enable TS output and interface pins */
sp8870_writereg(state, 0xc18, 0x00d); sp8870_writereg(state, 0xc18, 0x00d);
......
...@@ -518,7 +518,7 @@ static int sp887x_init(struct dvb_frontend* fe) ...@@ -518,7 +518,7 @@ static int sp887x_init(struct dvb_frontend* fe)
if (!state->initialised) { if (!state->initialised) {
/* request the firmware, this will block until someone uploads it */ /* request the firmware, this will block until someone uploads it */
printk("sp887x: waiting for firmware upload...\n"); printk("sp887x: waiting for firmware upload (%s)...\n", SP887X_DEFAULT_FIRMWARE);
ret = state->config->request_firmware(fe, &fw, SP887X_DEFAULT_FIRMWARE); ret = state->config->request_firmware(fe, &fw, SP887X_DEFAULT_FIRMWARE);
if (ret) { if (ret) {
printk("sp887x: no firmware upload (timeout or file not found?)\n"); printk("sp887x: no firmware upload (timeout or file not found?)\n");
...@@ -531,6 +531,7 @@ static int sp887x_init(struct dvb_frontend* fe) ...@@ -531,6 +531,7 @@ static int sp887x_init(struct dvb_frontend* fe)
release_firmware(fw); release_firmware(fw);
return ret; return ret;
} }
printk("sp887x: firmware upload complete\n");
state->initialised = 1; state->initialised = 1;
} }
......
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