tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] pcmcia: rename some functions

Rename some functions in drivers/pcmcia/ to show they belong to the PCMCIA
subsystem.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Dominik Brodowski and committed by Linus Torvalds e6ea0b9e 3b659fb8

+31 -32
unified split
+7 -7
drivers/pcmcia/cistpl.c
··· 90 90 { 91 91 pccard_mem_map *mem = &s->cis_mem; 92 92 if (!(s->features & SS_CAP_STATIC_MAP) && mem->res == NULL) { 93 - mem->res = find_mem_region(0, s->map_size, s->map_size, 0, s); 93 + mem->res = pcmcia_find_mem_region(0, s->map_size, s->map_size, 0, s); 94 94 if (mem->res == NULL) { 95 95 printk(KERN_NOTICE "cs: unable to map card memory!\n"); 96 96 return NULL; ··· 119 119 #define IS_ATTR 1 120 120 #define IS_INDIRECT 8 121 121 122 - int read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, 122 + int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, 123 123 u_int len, void *ptr) 124 124 { 125 125 void __iomem *sys, *end; 126 126 unsigned char *buf = ptr; 127 127 128 - cs_dbg(s, 3, "read_cis_mem(%d, %#x, %u)\n", attr, addr, len); 128 + cs_dbg(s, 3, "pcmcia_read_cis_mem(%d, %#x, %u)\n", attr, addr, len); 129 129 130 130 if (attr & IS_INDIRECT) { 131 131 /* Indirect accesses use a bunch of special registers at fixed ··· 183 183 return 0; 184 184 } 185 185 186 - void write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, 186 + void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr, 187 187 u_int len, void *ptr) 188 188 { 189 189 void __iomem *sys, *end; 190 190 unsigned char *buf = ptr; 191 191 192 - cs_dbg(s, 3, "write_cis_mem(%d, %#x, %u)\n", attr, addr, len); 192 + cs_dbg(s, 3, "pcmcia_write_cis_mem(%d, %#x, %u)\n", attr, addr, len); 193 193 194 194 if (attr & IS_INDIRECT) { 195 195 /* Indirect accesses use a bunch of special registers at fixed ··· 274 274 ret = read_cb_mem(s, attr, addr, len, ptr); 275 275 else 276 276 #endif 277 - ret = read_cis_mem(s, attr, addr, len, ptr); 277 + ret = pcmcia_read_cis_mem(s, attr, addr, len, ptr); 278 278 279 279 if (ret == 0) { 280 280 /* Copy data into the cache */ ··· 348 348 read_cb_mem(s, cis->attr, cis->addr, len, buf); 349 349 else 350 350 #endif 351 - read_cis_mem(s, cis->attr, cis->addr, len, buf); 351 + pcmcia_read_cis_mem(s, cis->attr, cis->addr, len, buf); 352 352 353 353 if (memcmp(buf, cis->cache, len) != 0) { 354 354 kfree(buf);
+16 -16
drivers/pcmcia/cs.c
··· 787 787 return 1; 788 788 for (i = 0; i < MAX_IO_WIN; i++) { 789 789 if (s->io[i].NumPorts == 0) { 790 - s->io[i].res = find_io_region(*base, num, align, s); 790 + s->io[i].res = pcmcia_find_io_region(*base, num, align, s); 791 791 if (s->io[i].res) { 792 792 s->io[i].Attributes = attr; 793 793 s->io[i].BasePort = *base = s->io[i].res->start; ··· 800 800 /* Try to extend top of window */ 801 801 try = s->io[i].BasePort + s->io[i].NumPorts; 802 802 if ((*base == 0) || (*base == try)) 803 - if (adjust_io_region(s->io[i].res, s->io[i].res->start, 803 + if (pcmcia_adjust_io_region(s->io[i].res, s->io[i].res->start, 804 804 s->io[i].res->end + num, s) == 0) { 805 805 *base = try; 806 806 s->io[i].NumPorts += num; ··· 810 810 /* Try to extend bottom of window */ 811 811 try = s->io[i].BasePort - num; 812 812 if ((*base == 0) || (*base == try)) 813 - if (adjust_io_region(s->io[i].res, s->io[i].res->start - num, 813 + if (pcmcia_adjust_io_region(s->io[i].res, s->io[i].res->start - num, 814 814 s->io[i].res->end, s) == 0) { 815 815 s->io[i].BasePort = *base = try; 816 816 s->io[i].NumPorts += num; ··· 872 872 873 873 switch (reg->Action) { 874 874 case CS_READ: 875 - read_cis_mem(s, 1, addr, 1, &val); 875 + pcmcia_read_cis_mem(s, 1, addr, 1, &val); 876 876 reg->Value = val; 877 877 break; 878 878 case CS_WRITE: 879 879 val = reg->Value; 880 - write_cis_mem(s, 1, addr, 1, &val); 880 + pcmcia_write_cis_mem(s, 1, addr, 1, &val); 881 881 break; 882 882 default: 883 883 return CS_BAD_ARGS; ··· 1050 1050 (c->IntType & (INT_MEMORY_AND_IO | INT_ZOOMED_VIDEO))) { 1051 1051 u_char reg; 1052 1052 if (c->Present & PRESENT_PIN_REPLACE) { 1053 - read_cis_mem(s, 1, (c->ConfigBase+CISREG_PRR)>>1, 1, &reg); 1053 + pcmcia_read_cis_mem(s, 1, (c->ConfigBase+CISREG_PRR)>>1, 1, &reg); 1054 1054 status->CardState |= 1055 1055 (reg & PRR_WP_STATUS) ? CS_EVENT_WRITE_PROTECT : 0; 1056 1056 status->CardState |= ··· 1064 1064 status->CardState |= CS_EVENT_READY_CHANGE; 1065 1065 } 1066 1066 if (c->Present & PRESENT_EXT_STATUS) { 1067 - read_cis_mem(s, 1, (c->ConfigBase+CISREG_ESR)>>1, 1, &reg); 1067 + pcmcia_read_cis_mem(s, 1, (c->ConfigBase+CISREG_ESR)>>1, 1, &reg); 1068 1068 status->CardState |= 1069 1069 (reg & ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0; 1070 1070 } ··· 1401 1401 c->Present = c->CardValues = req->Present; 1402 1402 if (req->Present & PRESENT_COPY) { 1403 1403 c->Copy = req->Copy; 1404 - write_cis_mem(s, 1, (base + CISREG_SCR)>>1, 1, &c->Copy); 1404 + pcmcia_write_cis_mem(s, 1, (base + CISREG_SCR)>>1, 1, &c->Copy); 1405 1405 } 1406 1406 if (req->Present & PRESENT_OPTION) { 1407 1407 if (s->functions == 1) { ··· 1415 1415 if (c->state & CONFIG_IRQ_REQ) 1416 1416 if (!(c->irq.Attributes & IRQ_FORCED_PULSE)) 1417 1417 c->Option |= COR_LEVEL_REQ; 1418 - write_cis_mem(s, 1, (base + CISREG_COR)>>1, 1, &c->Option); 1418 + pcmcia_write_cis_mem(s, 1, (base + CISREG_COR)>>1, 1, &c->Option); 1419 1419 mdelay(40); 1420 1420 } 1421 1421 if (req->Present & PRESENT_STATUS) { 1422 1422 c->Status = req->Status; 1423 - write_cis_mem(s, 1, (base + CISREG_CCSR)>>1, 1, &c->Status); 1423 + pcmcia_write_cis_mem(s, 1, (base + CISREG_CCSR)>>1, 1, &c->Status); 1424 1424 } 1425 1425 if (req->Present & PRESENT_PIN_REPLACE) { 1426 1426 c->Pin = req->Pin; 1427 - write_cis_mem(s, 1, (base + CISREG_PRR)>>1, 1, &c->Pin); 1427 + pcmcia_write_cis_mem(s, 1, (base + CISREG_PRR)>>1, 1, &c->Pin); 1428 1428 } 1429 1429 if (req->Present & PRESENT_EXT_STATUS) { 1430 1430 c->ExtStatus = req->ExtStatus; 1431 - write_cis_mem(s, 1, (base + CISREG_ESR)>>1, 1, &c->ExtStatus); 1431 + pcmcia_write_cis_mem(s, 1, (base + CISREG_ESR)>>1, 1, &c->ExtStatus); 1432 1432 } 1433 1433 if (req->Present & PRESENT_IOBASE_0) { 1434 1434 u_char b = c->io.BasePort1 & 0xff; 1435 - write_cis_mem(s, 1, (base + CISREG_IOBASE_0)>>1, 1, &b); 1435 + pcmcia_write_cis_mem(s, 1, (base + CISREG_IOBASE_0)>>1, 1, &b); 1436 1436 b = (c->io.BasePort1 >> 8) & 0xff; 1437 - write_cis_mem(s, 1, (base + CISREG_IOBASE_1)>>1, 1, &b); 1437 + pcmcia_write_cis_mem(s, 1, (base + CISREG_IOBASE_1)>>1, 1, &b); 1438 1438 } 1439 1439 if (req->Present & PRESENT_IOSIZE) { 1440 1440 u_char b = c->io.NumPorts1 + c->io.NumPorts2 - 1; 1441 - write_cis_mem(s, 1, (base + CISREG_IOSIZE)>>1, 1, &b); 1441 + pcmcia_write_cis_mem(s, 1, (base + CISREG_IOSIZE)>>1, 1, &b); 1442 1442 } 1443 1443 1444 1444 /* Configure I/O windows */ ··· 1678 1678 win->sock = s; 1679 1679 1680 1680 if (!(s->features & SS_CAP_STATIC_MAP)) { 1681 - win->ctl.res = find_mem_region(req->Base, req->Size, align, 1681 + win->ctl.res = pcmcia_find_mem_region(req->Base, req->Size, align, 1682 1682 (req->Attributes & WIN_MAP_BELOW_1MB), s); 1683 1683 if (!win->ctl.res) 1684 1684 return CS_IN_USE;
+5 -6
drivers/pcmcia/cs_internal.h
··· 123 123 int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len, void *ptr); 124 124 125 125 /* In cistpl.c */ 126 - int read_cis_mem(struct pcmcia_socket *s, int attr, 126 + int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, 127 127 u_int addr, u_int len, void *ptr); 128 - void write_cis_mem(struct pcmcia_socket *s, int attr, 128 + void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, 129 129 u_int addr, u_int len, void *ptr); 130 130 void release_cis_mem(struct pcmcia_socket *s); 131 131 void destroy_cis_cache(struct pcmcia_socket *s); ··· 134 134 135 135 /* In rsrc_mgr */ 136 136 void pcmcia_validate_mem(struct pcmcia_socket *s); 137 - struct resource *find_io_region(unsigned long base, int num, unsigned long align, 137 + struct resource *pcmcia_find_io_region(unsigned long base, int num, unsigned long align, 138 138 struct pcmcia_socket *s); 139 - int adjust_io_region(struct resource *res, unsigned long r_start, 139 + int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, 140 140 unsigned long r_end, struct pcmcia_socket *s); 141 - struct resource *find_mem_region(u_long base, u_long num, u_long align, 141 + struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, 142 142 int low, struct pcmcia_socket *s); 143 - int adjust_resource_info(client_handle_t handle, adjust_t *adj); 144 143 void release_resource_db(struct pcmcia_socket *s); 145 144 146 145 /* In socket_sysfs.c */
+3 -3
drivers/pcmcia/rsrc_mgr.c
··· 105 105 } 106 106 EXPORT_SYMBOL(pcmcia_validate_mem); 107 107 108 - int adjust_io_region(struct resource *res, unsigned long r_start, 108 + int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, 109 109 unsigned long r_end, struct pcmcia_socket *s) 110 110 { 111 111 if (s->resource_ops->adjust_io_region) ··· 113 113 return -ENOMEM; 114 114 } 115 115 116 - struct resource *find_io_region(unsigned long base, int num, 116 + struct resource *pcmcia_find_io_region(unsigned long base, int num, 117 117 unsigned long align, struct pcmcia_socket *s) 118 118 { 119 119 if (s->resource_ops->find_io) ··· 121 121 return NULL; 122 122 } 123 123 124 - struct resource *find_mem_region(u_long base, u_long num, u_long align, 124 + struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, 125 125 int low, struct pcmcia_socket *s) 126 126 { 127 127 if (s->resource_ops->find_mem)