aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2013-02-12 14:22:22 -0500
committerJon Hunter <jon-hunter@ti.com>2013-04-01 15:53:38 -0400
commitdf25cb4645a12b9300d4b14ceaf9071bc0f1cad8 (patch)
tree58129bc886a0707c86fdf773e63e7988f28769d3 /arch
parent80f5d373a6ed2f1708488c8fe467890433baee81 (diff)
ARM: omap2: gpmc-onenand: Replace pr_err() with dev_err()
Do this becasue dev_err() is preferred over pr_err() and because it will match gpmc-nand, thus the code shows looks more consistent. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Reviewed-by: Jon Hunter <jon-hunter@ti.com> Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/gpmc-onenand.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c
index f7c9c207d71b..a78921169210 100644
--- a/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/arch/arm/mach-omap2/gpmc-onenand.c
@@ -359,6 +359,7 @@ static int gpmc_onenand_setup(void __iomem *onenand_base, int *freq_ptr)
359void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data) 359void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
360{ 360{
361 int err; 361 int err;
362 struct device *dev = &gpmc_onenand_device.dev;
362 363
363 gpmc_onenand_data = _onenand_data; 364 gpmc_onenand_data = _onenand_data;
364 gpmc_onenand_data->onenand_setup = gpmc_onenand_setup; 365 gpmc_onenand_data->onenand_setup = gpmc_onenand_setup;
@@ -379,8 +380,8 @@ void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
379 err = gpmc_cs_request(gpmc_onenand_data->cs, ONENAND_IO_SIZE, 380 err = gpmc_cs_request(gpmc_onenand_data->cs, ONENAND_IO_SIZE,
380 (unsigned long *)&gpmc_onenand_resource.start); 381 (unsigned long *)&gpmc_onenand_resource.start);
381 if (err < 0) { 382 if (err < 0) {
382 pr_err("%s: Cannot request GPMC CS %d, error %d\n", 383 dev_err(dev, "Cannot request GPMC CS %d, error %d\n",
383 __func__, gpmc_onenand_data->cs, err); 384 gpmc_onenand_data->cs, err);
384 return; 385 return;
385 } 386 }
386 387
@@ -388,7 +389,7 @@ void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
388 ONENAND_IO_SIZE - 1; 389 ONENAND_IO_SIZE - 1;
389 390
390 if (platform_device_register(&gpmc_onenand_device) < 0) { 391 if (platform_device_register(&gpmc_onenand_device) < 0) {
391 pr_err("%s: Unable to register OneNAND device\n", __func__); 392 dev_err(dev, "Unable to register OneNAND device\n");
392 gpmc_cs_free(gpmc_onenand_data->cs); 393 gpmc_cs_free(gpmc_onenand_data->cs);
393 return; 394 return;
394 } 395 }