aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-24 12:46:42 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 03:04:14 -0400
commitb5cb259e7fac5536c4ddf350af6a3d6cc950e47e (patch)
treefd752edd9a19ad9592fdabc87465ba17019465f6 /drivers/isdn/hisax
parenta3d0d4d8dd45779b6e174a8567ffb9b485e472af (diff)
pcmcia: remove memreq_t
Page already had to be set to 0; Offset can easily be passed as parameter to pcmcia_map_mem_page. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-ide@vger.kernel.org CC: linux-usb@vger.kernel.org CC: laforge@gnumonks.org CC: linux-mtd@lists.infradead.org CC: linux-bluetooth@vger.kernel.org CC: alsa-devel@alsa-project.org CC: linux-serial@vger.kernel.org CC: Michael Buesch <mb@bu3sch.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/isdn/hisax')
-rw-r--r--drivers/isdn/hisax/sedlbauer_cs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 4755eb440f7e..0b06dbb2d52d 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -232,7 +232,6 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
232 */ 232 */
233 if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) { 233 if ((cfg->mem.nwin > 0) || (dflt->mem.nwin > 0)) {
234 cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem; 234 cistpl_mem_t *mem = (cfg->mem.nwin) ? &cfg->mem : &dflt->mem;
235 memreq_t map;
236 req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM; 235 req->Attributes = WIN_DATA_WIDTH_16|WIN_MEMORY_TYPE_CM;
237 req->Attributes |= WIN_ENABLE; 236 req->Attributes |= WIN_ENABLE;
238 req->Base = mem->win[0].host_addr; 237 req->Base = mem->win[0].host_addr;
@@ -240,9 +239,9 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,
240 req->AccessSpeed = 0; 239 req->AccessSpeed = 0;
241 if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0) 240 if (pcmcia_request_window(p_dev, req, &p_dev->win) != 0)
242 return -ENODEV; 241 return -ENODEV;
243 map.Page = 0; 242
244 map.CardOffset = mem->win[0].card_addr; 243 if (pcmcia_map_mem_page(p_dev, p_dev->win,
245 if (pcmcia_map_mem_page(p_dev, p_dev->win, &map) != 0) 244 mem->win[0].card_addr) != 0)
246 return -ENODEV; 245 return -ENODEV;
247 } 246 }
248 return 0; 247 return 0;