diff options
| author | Hartley Sweeten <hartleys@visionengravers.com> | 2010-01-11 13:33:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-12 07:38:32 -0500 |
| commit | 64d6882d02b0e5f74dd5572039e88517e40edb50 (patch) | |
| tree | e68814a65173474bc03a466f6b90afd2577f5019 | |
| parent | f3f1882ca7bc6b26bcf66ef206eec0c66d823ed3 (diff) | |
ARM: 5877/1: ep93xx: use pr_fmt in core.c
Use pr_fmt to prefix kernel output with the module name.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-ep93xx/core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 1f0d66561bbe..41064bd63e38 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | * your option) any later version. | 14 | * your option) any later version. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #define pr_fmt(fmt) "ep93xx " KBUILD_MODNAME ": " fmt | ||
| 18 | |||
| 17 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 18 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 19 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| @@ -318,8 +320,7 @@ static int ep93xx_gpio_irq_type(unsigned int irq, unsigned int type) | |||
| 318 | desc->handle_irq = handle_edge_irq; | 320 | desc->handle_irq = handle_edge_irq; |
| 319 | break; | 321 | break; |
| 320 | default: | 322 | default: |
| 321 | pr_err("ep93xx: failed to set irq type %d for gpio %d\n", | 323 | pr_err("failed to set irq type %d for gpio %d\n", type, gpio); |
| 322 | type, gpio); | ||
| 323 | return -EINVAL; | 324 | return -EINVAL; |
| 324 | } | 325 | } |
| 325 | 326 | ||
| @@ -572,9 +573,9 @@ void __init ep93xx_register_i2c(struct i2c_gpio_platform_data *data, | |||
| 572 | * CMOS driver. | 573 | * CMOS driver. |
| 573 | */ | 574 | */ |
| 574 | if (data->sda_is_open_drain && data->sda_pin != EP93XX_GPIO_LINE_EEDAT) | 575 | if (data->sda_is_open_drain && data->sda_pin != EP93XX_GPIO_LINE_EEDAT) |
| 575 | pr_warning("ep93xx: sda != EEDAT, open drain has no effect\n"); | 576 | pr_warning("sda != EEDAT, open drain has no effect\n"); |
| 576 | if (data->scl_is_open_drain && data->scl_pin != EP93XX_GPIO_LINE_EECLK) | 577 | if (data->scl_is_open_drain && data->scl_pin != EP93XX_GPIO_LINE_EECLK) |
| 577 | pr_warning("ep93xx: scl != EECLK, open drain has no effect\n"); | 578 | pr_warning("scl != EECLK, open drain has no effect\n"); |
| 578 | 579 | ||
| 579 | __raw_writel((data->sda_is_open_drain << 1) | | 580 | __raw_writel((data->sda_is_open_drain << 1) | |
| 580 | (data->scl_is_open_drain << 0), | 581 | (data->scl_is_open_drain << 0), |
