From: Jeff Garzik <jgarzik@pobox.com>
To: Greg KH <greg@kroah.com>
Cc: linux-kernel@vger.kernel.org, "David S. Miller" <davem@redhat.com>
Subject: Re: [BK PATCH] pcibios_* removals for 2.5.40
Date: Fri, 04 Oct 2002 17:40:07 -0400 [thread overview]
Message-ID: <3D9E0AB7.8090905@pobox.com> (raw)
In-Reply-To: 20021004205222.GB8346@kroah.com
Greg KH wrote:
> # This is a BitKeeper generated patch for the following project:
> # Project Name: Linux kernel tree
> # This patch format is intended for GNU patch command version 2.5 or higher.
> # This patch includes the following deltas:
> # ChangeSet 1.674.3.3 -> 1.674.3.4
> # drivers/char/rocket.c 1.12 -> 1.13
> # drivers/scsi/inia100.c 1.10 -> 1.11
> # drivers/sbus/sbus.c 1.15 -> 1.16
> #
> # The following is the BitKeeper ChangeSet Log
> # --------------------------------------------
> # 02/10/04 greg@kroah.com 1.674.3.4
> # PCI: fixed remaining usages of pcibios_present() that I missed previously.
> # --------------------------------------------
> #
> diff -Nru a/drivers/char/rocket.c b/drivers/char/rocket.c
> --- a/drivers/char/rocket.c Fri Oct 4 13:47:29 2002
> +++ b/drivers/char/rocket.c Fri Oct 4 13:47:29 2002
> @@ -1993,7 +1993,7 @@
> isa_boards_found++;
> }
> #ifdef CONFIG_PCI
> - if (pcibios_present()) {
> + if (pci_present()) {
> if(isa_boards_found < NUM_BOARDS)
> pci_boards_found = init_PCI(isa_boards_found);
> } else {
can be greatly simplified -- just simply all the code in the ifdef to
"if (isa_boards_found...) ...init_PCI..."
> diff -Nru a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
> --- a/drivers/sbus/sbus.c Fri Oct 4 13:47:29 2002
> +++ b/drivers/sbus/sbus.c Fri Oct 4 13:47:29 2002
> @@ -312,7 +312,7 @@
> nd = prom_searchsiblings(topnd, "sbus");
> if(nd == 0) {
> #ifdef CONFIG_PCI
> - if (!pcibios_present()) {
> + if (!pci_present()) {
> prom_printf("Neither SBUS nor PCI found.\n");
> prom_halt();
> } else {
I wonder if this is intentional arch code should not be changed... David?
> diff -Nru a/drivers/scsi/inia100.c b/drivers/scsi/inia100.c
> --- a/drivers/scsi/inia100.c Fri Oct 4 13:47:29 2002
> +++ b/drivers/scsi/inia100.c Fri Oct 4 13:47:29 2002
> @@ -208,7 +208,7 @@
> /*
> * PCI-bus probe.
> */
> - if (pcibios_present()) {
> + if (pci_present()) {
test looks like it can be eliminated completely
next prev parent reply other threads:[~2002-10-04 21:35 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-03 22:40 [BK PATCH] pcibios_* removals for 2.5.40 Greg KH
2002-10-03 22:40 ` Greg KH
2002-10-03 22:41 ` Greg KH
2002-10-03 22:41 ` Greg KH
2002-10-04 16:33 ` Linus Torvalds
2002-10-04 16:53 ` Alan Cox
2002-10-04 17:30 ` Linus Torvalds
2002-10-04 18:01 ` Greg KH
2002-10-04 16:59 ` Greg KH
2002-10-04 17:28 ` Alan Cox
2002-10-04 18:07 ` Arnaldo Carvalho de Melo
2002-10-04 20:51 ` Greg KH
2002-10-04 20:52 ` Greg KH
2002-10-04 20:53 ` Greg KH
2002-10-04 20:54 ` Greg KH
2002-10-04 21:34 ` Jeff Garzik
2002-10-04 21:52 ` Greg KH
2002-10-04 21:36 ` Jeff Garzik
2002-10-04 21:40 ` Jeff Garzik [this message]
2002-10-04 21:53 ` Greg KH
2002-10-04 22:14 ` Russell King
2002-10-04 18:03 ` Jeff Garzik
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=3D9E0AB7.8090905@pobox.com \
--to=jgarzik@pobox.com \
--cc=davem@redhat.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.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