From bd08d9d80e75b86070d43dbb7235337acee17aa7 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 12 Feb 2013 16:22:22 -0300 Subject: [PATCH] --- yaml --- r: 372335 b: refs/heads/master c: df25cb4645a12b9300d4b14ceaf9071bc0f1cad8 h: refs/heads/master i: 372333: 34387522cdd35e8b78e461bb3b9f133aeebc1e9b 372331: dd248c2bcaf7de4d8500519512b64b6d0e127f6f 372327: 7af3b7358681faa338d0322d219fe4881ada294d 372319: 68a67f3fc1493ec3cda05e302faf149c35f73475 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/gpmc-onenand.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d3663595d0af..dd94b483e52a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80f5d373a6ed2f1708488c8fe467890433baee81 +refs/heads/master: df25cb4645a12b9300d4b14ceaf9071bc0f1cad8 diff --git a/trunk/arch/arm/mach-omap2/gpmc-onenand.c b/trunk/arch/arm/mach-omap2/gpmc-onenand.c index f7c9c207d71b..a78921169210 100644 --- a/trunk/arch/arm/mach-omap2/gpmc-onenand.c +++ b/trunk/arch/arm/mach-omap2/gpmc-onenand.c @@ -359,6 +359,7 @@ static int gpmc_onenand_setup(void __iomem *onenand_base, int *freq_ptr) void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data) { int err; + struct device *dev = &gpmc_onenand_device.dev; gpmc_onenand_data = _onenand_data; gpmc_onenand_data->onenand_setup = gpmc_onenand_setup; @@ -379,8 +380,8 @@ void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data) err = gpmc_cs_request(gpmc_onenand_data->cs, ONENAND_IO_SIZE, (unsigned long *)&gpmc_onenand_resource.start); if (err < 0) { - pr_err("%s: Cannot request GPMC CS %d, error %d\n", - __func__, gpmc_onenand_data->cs, err); + dev_err(dev, "Cannot request GPMC CS %d, error %d\n", + gpmc_onenand_data->cs, err); return; } @@ -388,7 +389,7 @@ void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data) ONENAND_IO_SIZE - 1; if (platform_device_register(&gpmc_onenand_device) < 0) { - pr_err("%s: Unable to register OneNAND device\n", __func__); + dev_err(dev, "Unable to register OneNAND device\n"); gpmc_cs_free(gpmc_onenand_data->cs); return; }