summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2018-10-04 09:01:03 -0400
committerBoris Brezillon <boris.brezillon@bootlin.com>2018-10-05 04:20:31 -0400
commit34cb1e31890c97d0ee89755d5f2833737fa30a03 (patch)
treebfe4a26d5b656525139ad7f6f6917246494a4e11
parentef0de747f7ad179c7698a5b0e28db05f18ecbf57 (diff)
mtd: maps: gpio-addr-flash: Replace custom printk
Use preferred print methods dev_* Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
-rw-r--r--drivers/mtd/maps/gpio-addr-flash.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 9d9723693217..17be47f72973 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -25,11 +25,7 @@
25#include <linux/slab.h> 25#include <linux/slab.h>
26#include <linux/types.h> 26#include <linux/types.h>
27 27
28#define pr_devinit(fmt, args...) \
29 ({ static const char __fmt[] = fmt; printk(__fmt, ## args); })
30
31#define DRIVER_NAME "gpio-addr-flash" 28#define DRIVER_NAME "gpio-addr-flash"
32#define PFX DRIVER_NAME ": "
33 29
34/** 30/**
35 * struct async_state - keep GPIO flash state 31 * struct async_state - keep GPIO flash state
@@ -250,7 +246,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
250 i = 0; 246 i = 0;
251 do { 247 do {
252 if (gpio_request(state->gpio_addrs[i], DRIVER_NAME)) { 248 if (gpio_request(state->gpio_addrs[i], DRIVER_NAME)) {
253 pr_devinit(KERN_ERR PFX "failed to request gpio %d\n", 249 dev_err(&pdev->dev, "failed to request gpio %d\n",
254 state->gpio_addrs[i]); 250 state->gpio_addrs[i]);
255 while (i--) 251 while (i--)
256 gpio_free(state->gpio_addrs[i]); 252 gpio_free(state->gpio_addrs[i]);
@@ -260,8 +256,8 @@ static int gpio_flash_probe(struct platform_device *pdev)
260 gpio_direction_output(state->gpio_addrs[i], 0); 256 gpio_direction_output(state->gpio_addrs[i], 0);
261 } while (++i < state->gpio_count); 257 } while (++i < state->gpio_count);
262 258
263 pr_devinit(KERN_NOTICE PFX "probing %d-bit flash bus\n", 259 dev_notice(&pdev->dev, "probing %d-bit flash bus\n",
264 state->map.bankwidth * 8); 260 state->map.bankwidth * 8);
265 state->mtd = do_map_probe(memory->name, &state->map); 261 state->mtd = do_map_probe(memory->name, &state->map);
266 if (!state->mtd) { 262 if (!state->mtd) {
267 for (i = 0; i < state->gpio_count; ++i) 263 for (i = 0; i < state->gpio_count; ++i)