diff options
Diffstat (limited to 'drivers/mtd/maps/bfin-async-flash.c')
-rw-r--r-- | drivers/mtd/maps/bfin-async-flash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index ef5cde84a8b3..f833edfaab79 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c | |||
@@ -30,7 +30,8 @@ | |||
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | #include <asm/unaligned.h> | 31 | #include <asm/unaligned.h> |
32 | 32 | ||
33 | #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) | 33 | #define pr_devinit(fmt, args...) \ |
34 | ({ static const char __fmt[] = fmt; printk(__fmt, ## args); }) | ||
34 | 35 | ||
35 | #define DRIVER_NAME "bfin-async-flash" | 36 | #define DRIVER_NAME "bfin-async-flash" |
36 | 37 | ||
@@ -123,7 +124,7 @@ static void bfin_flash_copy_to(struct map_info *map, unsigned long to, const voi | |||
123 | 124 | ||
124 | static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; | 125 | static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; |
125 | 126 | ||
126 | static int __devinit bfin_flash_probe(struct platform_device *pdev) | 127 | static int bfin_flash_probe(struct platform_device *pdev) |
127 | { | 128 | { |
128 | int ret; | 129 | int ret; |
129 | struct physmap_flash_data *pdata = pdev->dev.platform_data; | 130 | struct physmap_flash_data *pdata = pdev->dev.platform_data; |
@@ -172,7 +173,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) | |||
172 | return 0; | 173 | return 0; |
173 | } | 174 | } |
174 | 175 | ||
175 | static int __devexit bfin_flash_remove(struct platform_device *pdev) | 176 | static int bfin_flash_remove(struct platform_device *pdev) |
176 | { | 177 | { |
177 | struct async_state *state = platform_get_drvdata(pdev); | 178 | struct async_state *state = platform_get_drvdata(pdev); |
178 | gpio_free(state->enet_flash_pin); | 179 | gpio_free(state->enet_flash_pin); |
@@ -184,7 +185,7 @@ static int __devexit bfin_flash_remove(struct platform_device *pdev) | |||
184 | 185 | ||
185 | static struct platform_driver bfin_flash_driver = { | 186 | static struct platform_driver bfin_flash_driver = { |
186 | .probe = bfin_flash_probe, | 187 | .probe = bfin_flash_probe, |
187 | .remove = __devexit_p(bfin_flash_remove), | 188 | .remove = bfin_flash_remove, |
188 | .driver = { | 189 | .driver = { |
189 | .name = DRIVER_NAME, | 190 | .name = DRIVER_NAME, |
190 | }, | 191 | }, |