commit 8e5d17ebe41eb98a538ef13aad36da5136701aab
author Dominik Brodowski <linux@dominikbrodowski.net> Wed Sep 07 16:00:28 2005 -0700
committer Dominik Brodowski <linux@dominikbrodowski.net> Mon Sep 26 13:11:25 2005 +0200
tree 95a6ba3afade2d9c721e21046af00d16492b2d4f
parent a413c09094e4df714c274690928dcf8125daf7e8

[PATCH] yenta: tiny cleanup

pci_set_power_state is not needed, as we call pci_enable_device() somewhere
else.  Also, the resource we write to PCI_BASE_ADDRESS_0 needs to be converted
to bus-centric view first.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

drivers/pcmcia/yenta_socket.c

diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 53a02f0..80806c9 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -987,11 +987,12 @@
 {
 	u16 bridge;
 	struct pci_dev *dev = socket->dev;
+	struct pci_bus_region region;
 
-	pci_set_power_state(socket->dev, 0);
+	pcibios_resource_to_bus(socket->dev, &region, &dev->resource[0]);
 
 	config_writel(socket, CB_LEGACY_MODE_BASE, 0);
-	config_writel(socket, PCI_BASE_ADDRESS_0, dev->resource[0].start);
+	config_writel(socket, PCI_BASE_ADDRESS_0, region.start);
 	config_writew(socket, PCI_COMMAND,
 			PCI_COMMAND_IO |
 			PCI_COMMAND_MEMORY |