lkml.org 
[lkml]   [2006]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/5] PCI : Move pci_fixup_device and is_enabled
This patch adds the following changes into generic PCI code especially
for PCI legacy I/O port free drivers.

- Moved the following two things from pci_enable_device() into
pci_enable_device_bars(). Already some drivers are using
pci_enable_device_bars() to enable only the specific regions,
but they had no chance to be fixup and to up is_enabled flag.

o Call pci_fixup_device() on the device
o Checking & Setting dev->is_enabled

- Trivial cleanup

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>

---
drivers/pci/pci.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)

Index: linux-2.6.19-rc6/drivers/pci/pci.c
===================================================================
--- linux-2.6.19-rc6.orig/drivers/pci/pci.c
+++ linux-2.6.19-rc6/drivers/pci/pci.c
@@ -558,12 +558,18 @@
{
int err;

+ if (dev->is_enabled)
+ return 0;
+
err = pci_set_power_state(dev, PCI_D0);
if (err < 0 && err != -EIO)
return err;
err = pcibios_enable_device(dev, bars);
if (err < 0)
return err;
+
+ pci_fixup_device(pci_fixup_enable, dev);
+ dev->is_enabled = 1;
return 0;
}

@@ -578,17 +584,7 @@
int
pci_enable_device(struct pci_dev *dev)
{
- int err;
-
- if (dev->is_enabled)
- return 0;
-
- err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
- if (err)
- return err;
- pci_fixup_device(pci_fixup_enable, dev);
- dev->is_enabled = 1;
- return 0;
+ return pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
}

/**
@@ -737,7 +733,7 @@
{
if (pci_resource_len(pdev, bar) == 0)
return 0;
-
+
if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) {
if (!request_region(pci_resource_start(pdev, bar),
pci_resource_len(pdev, bar), res_name))
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-11-22 09:07    [W:0.037 / U:2.504 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site