From: Johannes Stezenbach <js@linuxtv.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: linux-kernel@vger.kernel.org, js@linuxtv.org
Subject: [PATCH 4/4] cleanup firmware loading printks
Date: Tue, 25 Jan 2005 01:31:41 +0100 [thread overview]
Message-ID: <11066131012142@linuxtv.org> (raw)
In-Reply-To: <11066130981300@linuxtv.org>
- [DVB] frontends: sp887x: improve confusing firmware loading messages
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
diff -rupN linux-2.6.11-rc2-bk2/drivers/media/dvb/frontends/sp8870.c linux-2.6.11-rc2-bk2-dvb/drivers/media/dvb/frontends/sp8870.c
--- linux-2.6.11-rc2-bk2/drivers/media/dvb/frontends/sp8870.c 2004-12-24 22:35:40.000000000 +0100
+++ linux-2.6.11-rc2-bk2-dvb/drivers/media/dvb/frontends/sp8870.c 2005-01-25 00:40:10.000000000 +0100
@@ -313,7 +313,7 @@ static int sp8870_init (struct dvb_front
/* 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)) {
printk("sp8870: no firmware upload (timeout or file not found?)\n");
release_firmware(fw);
@@ -325,6 +325,7 @@ static int sp8870_init (struct dvb_front
release_firmware(fw);
return -EIO;
}
+ printk("sp8870: firmware upload complete\n");
/* enable TS output and interface pins */
sp8870_writereg(state, 0xc18, 0x00d);
diff -rupN linux-2.6.11-rc2-bk2/drivers/media/dvb/frontends/sp887x.c linux-2.6.11-rc2-bk2-dvb/drivers/media/dvb/frontends/sp887x.c
--- linux-2.6.11-rc2-bk2/drivers/media/dvb/frontends/sp887x.c 2004-12-24 22:35:24.000000000 +0100
+++ linux-2.6.11-rc2-bk2-dvb/drivers/media/dvb/frontends/sp887x.c 2005-01-25 00:41:31.000000000 +0100
@@ -518,7 +518,7 @@ static int sp887x_init(struct dvb_fronte
if (!state->initialised) {
/* 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);
if (ret) {
printk("sp887x: no firmware upload (timeout or file not found?)\n");
@@ -531,6 +531,7 @@ static int sp887x_init(struct dvb_fronte
release_firmware(fw);
return ret;
}
+ printk("sp887x: firmware upload complete\n");
state->initialised = 1;
}
prev parent reply other threads:[~2005-01-25 0:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-25 0:31 [PATCH 0/4] 2.6.11-rc2-bk2 DVB fixes Johannes Stezenbach
2005-01-25 0:31 ` [PATCH 1/4] follow USB __le16 changes Johannes Stezenbach
2005-01-25 0:31 ` [PATCH 2/4] fix access to freed memory Johannes Stezenbach
2005-01-25 0:31 ` [PATCH 3/4] support up to six DVB cards Johannes Stezenbach
2005-01-25 0:31 ` Johannes Stezenbach [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11066131012142@linuxtv.org \
--to=js@linuxtv.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox