aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ray_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-24 13:03:02 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 03:04:16 -0400
commit0ca724d37af370dbf2d55dc4d6359ead558e5756 (patch)
tree994685118202d9bf54f11ec9b39a654f6fb4f21f /drivers/net/wireless/ray_cs.c
parentb5cb259e7fac5536c4ddf350af6a3d6cc950e47e (diff)
pcmcia: use struct resource for PCMCIA devices, part 2
Use struct resource * also for iomem resources. CC: linux-mtd@lists.infradead.org CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r--drivers/net/wireless/ray_cs.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 7eb339af351b..a860bce6849b 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -785,7 +785,6 @@ static void ray_release(struct pcmcia_device *link)
785{ 785{
786 struct net_device *dev = link->priv; 786 struct net_device *dev = link->priv;
787 ray_dev_t *local = netdev_priv(dev); 787 ray_dev_t *local = netdev_priv(dev);
788 int i;
789 788
790 dev_dbg(&link->dev, "ray_release\n"); 789 dev_dbg(&link->dev, "ray_release\n");
791 790
@@ -794,13 +793,6 @@ static void ray_release(struct pcmcia_device *link)
794 iounmap(local->sram); 793 iounmap(local->sram);
795 iounmap(local->rmem); 794 iounmap(local->rmem);
796 iounmap(local->amem); 795 iounmap(local->amem);
797 /* Do bother checking to see if these succeed or not */
798 i = pcmcia_release_window(link, local->amem_handle);
799 if (i != 0)
800 dev_dbg(&link->dev, "ReleaseWindow(local->amem) ret = %x\n", i);
801 i = pcmcia_release_window(link, local->rmem_handle);
802 if (i != 0)
803 dev_dbg(&link->dev, "ReleaseWindow(local->rmem) ret = %x\n", i);
804 pcmcia_disable_device(link); 796 pcmcia_disable_device(link);
805 797
806 dev_dbg(&link->dev, "ray_release ending\n"); 798 dev_dbg(&link->dev, "ray_release ending\n");