aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
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/pcmcia
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/pcmcia')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index a48d4a91d440..975baaa8168b 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -193,7 +193,7 @@ EXPORT_SYMBOL(pcmcia_write_config_byte);
193 193
194 194
195int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh, 195int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh,
196 memreq_t *req) 196 unsigned int offset)
197{ 197{
198 struct pcmcia_socket *s = p_dev->socket; 198 struct pcmcia_socket *s = p_dev->socket;
199 int ret; 199 int ret;
@@ -201,12 +201,9 @@ int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh,
201 wh--; 201 wh--;
202 if (wh >= MAX_WIN) 202 if (wh >= MAX_WIN)
203 return -EINVAL; 203 return -EINVAL;
204 if (req->Page != 0) { 204
205 dev_dbg(&s->dev, "failure: requested page is zero\n");
206 return -EINVAL;
207 }
208 mutex_lock(&s->ops_mutex); 205 mutex_lock(&s->ops_mutex);
209 s->win[wh].card_start = req->CardOffset; 206 s->win[wh].card_start = offset;
210 ret = s->ops->set_mem_map(s, &s->win[wh]); 207 ret = s->ops->set_mem_map(s, &s->win[wh]);
211 if (ret) 208 if (ret)
212 dev_warn(&s->dev, "failed to set_mem_map\n"); 209 dev_warn(&s->dev, "failed to set_mem_map\n");