[PCMCIA] Move SS_CAP_PAGE_REGS test into find_mem_region()

We must always allocate windows below 1MB when a socket driver
indicates that it does not have "page registers".  Handle this
case in rsrc_mgr.c within find_mem_region rather than each use
of find_mem_region().

drivers/pcmcia/cistpl.c

@@ -106,11 +106,10 @@ set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flag
     pccard_mem_map *mem = &s->cis_mem;
     if (!(s->features & SS_CAP_STATIC_MAP) &&
 	mem->sys_start == 0) {
-	int low = !(s->features & SS_CAP_PAGE_REGS);
 	validate_mem(s);
 	mem->sys_start = 0;
 	if (find_mem_region(&mem->sys_start, s->map_size,
-			    s->map_size, low, "card services", s)) {
+			    s->map_size, 0, "card services", s)) {
 	    printk(KERN_NOTICE "cs: unable to map card memory!\n");
 	    return NULL;
 	}

drivers/pcmcia/cs.c

@@ -2043,8 +2043,7 @@ int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle
 
     if (!(s->features & SS_CAP_STATIC_MAP) &&
 	find_mem_region(&win->base, win->size, align,
-			(req->Attributes & WIN_MAP_BELOW_1MB) ||
-			!(s->features & SS_CAP_PAGE_REGS),
+			(req->Attributes & WIN_MAP_BELOW_1MB),
 			(*handle)->dev_info, s))
 	return CS_IN_USE;
     (*handle)->state |= CLIENT_WIN_REQ(w);

drivers/pcmcia/cs_internal.h

@@ -168,7 +168,7 @@ void validate_mem(struct pcmcia_socket *s);
 int find_io_region(ioaddr_t *base, ioaddr_t num, ioaddr_t align,
 		   char *name, struct pcmcia_socket *s);
 int find_mem_region(u_long *base, u_long num, u_long align,
-		    int force_low, char *name, struct pcmcia_socket *s);
+		    int low, char *name, struct pcmcia_socket *s);
 int try_irq(u_int Attributes, int irq, int specific);
 void undo_irq(u_int Attributes, int irq);
 int adjust_resource_info(client_handle_t handle, adjust_t *adj);

drivers/pcmcia/rsrc_mgr.c

@@ -590,17 +590,19 @@ int find_io_region(ioaddr_t *base, ioaddr_t num, ioaddr_t align,
 }
 
 int find_mem_region(u_long *base, u_long num, u_long align,
-		    int force_low, char *name, struct pcmcia_socket *s)
+		    int low, char *name, struct pcmcia_socket *s)
 {
     u_long try;
     resource_map_t *m;
     int ret = -1;
 
+    low = low || !(s->features & SS_CAP_PAGE_REGS);
+
     down(&rsrc_sem);
     while (1) {
 	for (m = mem_db.next; m != &mem_db; m = m->next) {
 	    /* first pass >1MB, second pass <1MB */
-	    if ((force_low != 0) ^ (m->base < 0x100000))
+	    if ((low != 0) ^ (m->base < 0x100000))
 		continue;
 
 	    try = (m->base & ~(align-1)) + *base;
@@ -616,9 +618,9 @@ int find_mem_region(u_long *base, u_long num, u_long align,
 		    break;
 	    }
 	}
-	if (force_low)
+	if (low)
 	    break;
-	force_low++;
+	low++;
     }
  out:
     up(&rsrc_sem);