diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-18 16:44:19 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 07:36:04 -0400 |
commit | cb53b3b99992b6c548d56cdf47bc710640ee2ee1 (patch) | |
tree | b47772c81b5a2adfbd2ca96bbc4f4b29d8a2e3c3 /drivers/mtd/maps | |
parent | 35d086b143e52f43a70c85ab86c054cbf1c4ff26 (diff) |
[MTD] replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r-- | drivers/mtd/maps/bast-flash.c | 4 | ||||
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/pmcmsp-flash.c | 2 | ||||
-rw-r--r-- | drivers/mtd/maps/tqm8xxl.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c index fc3b2672d1e2..59fea2a89804 100644 --- a/drivers/mtd/maps/bast-flash.c +++ b/drivers/mtd/maps/bast-flash.c | |||
@@ -137,7 +137,7 @@ static int bast_flash_probe(struct platform_device *pdev) | |||
137 | if (info->map.size > AREA_MAXSIZE) | 137 | if (info->map.size > AREA_MAXSIZE) |
138 | info->map.size = AREA_MAXSIZE; | 138 | info->map.size = AREA_MAXSIZE; |
139 | 139 | ||
140 | pr_debug("%s: area %08lx, size %ld\n", __FUNCTION__, | 140 | pr_debug("%s: area %08lx, size %ld\n", __func__, |
141 | info->map.phys, info->map.size); | 141 | info->map.phys, info->map.size); |
142 | 142 | ||
143 | info->area = request_mem_region(res->start, info->map.size, | 143 | info->area = request_mem_region(res->start, info->map.size, |
@@ -149,7 +149,7 @@ static int bast_flash_probe(struct platform_device *pdev) | |||
149 | } | 149 | } |
150 | 150 | ||
151 | info->map.virt = ioremap(res->start, info->map.size); | 151 | info->map.virt = ioremap(res->start, info->map.size); |
152 | pr_debug("%s: virt at %08x\n", __FUNCTION__, (int)info->map.virt); | 152 | pr_debug("%s: virt at %08x\n", __func__, (int)info->map.virt); |
153 | 153 | ||
154 | if (info->map.virt == 0) { | 154 | if (info->map.virt == 0) { |
155 | printk(KERN_ERR PFX "failed to ioremap() region\n"); | 155 | printk(KERN_ERR PFX "failed to ioremap() region\n"); |
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index eaeb56a4070a..1912d968718b 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -33,7 +33,7 @@ MODULE_PARM_DESC(debug, "Set Debug Level 0=quiet, 5=noisy"); | |||
33 | #undef DEBUG | 33 | #undef DEBUG |
34 | #define DEBUG(n, format, arg...) \ | 34 | #define DEBUG(n, format, arg...) \ |
35 | if (n <= debug) { \ | 35 | if (n <= debug) { \ |
36 | printk(KERN_DEBUG __FILE__ ":%s(): " format "\n", __FUNCTION__ , ## arg); \ | 36 | printk(KERN_DEBUG __FILE__ ":%s(): " format "\n", __func__ , ## arg); \ |
37 | } | 37 | } |
38 | 38 | ||
39 | #else | 39 | #else |
diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index 02bde8c982ec..f43ba2815cbb 100644 --- a/drivers/mtd/maps/pmcmsp-flash.c +++ b/drivers/mtd/maps/pmcmsp-flash.c | |||
@@ -46,7 +46,7 @@ static struct mtd_partition **msp_parts; | |||
46 | static struct map_info *msp_maps; | 46 | static struct map_info *msp_maps; |
47 | static int fcnt; | 47 | static int fcnt; |
48 | 48 | ||
49 | #define DEBUG_MARKER printk(KERN_NOTICE "%s[%d]\n",__FUNCTION__,__LINE__) | 49 | #define DEBUG_MARKER printk(KERN_NOTICE "%s[%d]\n", __func__, __LINE__) |
50 | 50 | ||
51 | int __init init_msp_flash(void) | 51 | int __init init_msp_flash(void) |
52 | { | 52 | { |
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c index 37e4ded9b600..521734057314 100644 --- a/drivers/mtd/maps/tqm8xxl.c +++ b/drivers/mtd/maps/tqm8xxl.c | |||
@@ -124,7 +124,7 @@ int __init init_tqm_mtd(void) | |||
124 | //request maximum flash size address space | 124 | //request maximum flash size address space |
125 | start_scan_addr = ioremap(flash_addr, flash_size); | 125 | start_scan_addr = ioremap(flash_addr, flash_size); |
126 | if (!start_scan_addr) { | 126 | if (!start_scan_addr) { |
127 | printk(KERN_WARNING "%s:Failed to ioremap address:0x%x\n", __FUNCTION__, flash_addr); | 127 | printk(KERN_WARNING "%s:Failed to ioremap address:0x%x\n", __func__, flash_addr); |
128 | return -EIO; | 128 | return -EIO; |
129 | } | 129 | } |
130 | 130 | ||
@@ -132,7 +132,7 @@ int __init init_tqm_mtd(void) | |||
132 | if(mtd_size >= flash_size) | 132 | if(mtd_size >= flash_size) |
133 | break; | 133 | break; |
134 | 134 | ||
135 | printk(KERN_INFO "%s: chip probing count %d\n", __FUNCTION__, idx); | 135 | printk(KERN_INFO "%s: chip probing count %d\n", __func__, idx); |
136 | 136 | ||
137 | map_banks[idx] = kzalloc(sizeof(struct map_info), GFP_KERNEL); | 137 | map_banks[idx] = kzalloc(sizeof(struct map_info), GFP_KERNEL); |
138 | if(map_banks[idx] == NULL) { | 138 | if(map_banks[idx] == NULL) { |
@@ -178,7 +178,7 @@ int __init init_tqm_mtd(void) | |||
178 | mtd_size += mtd_banks[idx]->size; | 178 | mtd_size += mtd_banks[idx]->size; |
179 | num_banks++; | 179 | num_banks++; |
180 | 180 | ||
181 | printk(KERN_INFO "%s: bank%d, name:%s, size:%dbytes \n", __FUNCTION__, num_banks, | 181 | printk(KERN_INFO "%s: bank%d, name:%s, size:%dbytes \n", __func__, num_banks, |
182 | mtd_banks[idx]->name, mtd_banks[idx]->size); | 182 | mtd_banks[idx]->name, mtd_banks[idx]->size); |
183 | } | 183 | } |
184 | } | 184 | } |