lkml.org 
[lkml]   [2009]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: GPIO support for HTC Dream
On Tue 2009-12-08 14:03:32, Joe Perches wrote:
> On Tue, 2009-12-08 at 22:46 +0100, Pavel Machek wrote:
> > Add GPIO support for HTC Dream.
>
> Hi Pavel. Thanks for this.
>
> Maybe it'd be nicer to use pr_<level> and add
> #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
> ?

It included names of functions, anyway, so agreed. Incremental patch:

(I'll fold them all and resubmit).

diff --git a/arch/arm/mach-msm/board-dream-gpio.c b/arch/arm/mach-msm/board-dream-gpio.c
index d9201f9..221c3bd 100644
--- a/arch/arm/mach-msm/board-dream-gpio.c
+++ b/arch/arm/mach-msm/board-dream-gpio.c
@@ -30,6 +30,8 @@
#undef MODULE_PARAM_PREFIX
#define MODULE_PARAM_PREFIX "board_trout."

+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
static uint cpld_usb_h2w_sw;
module_param_named(usb_h2w_sw, cpld_usb_h2w_sw, uint, 0);

@@ -83,7 +85,7 @@ static int dream_gpio_write(struct gpio_chip *chip, unsigned n, unsigned on)
uint8_t reg_val;

if ((reg >> 1) >= ARRAY_SIZE(dream_cpld_shadow)) {
- printk(KERN_ERR "dream_gpio_write called on input %d\n", n);
+ pr_err("called on input %d\n", n);
return -ENOTSUPP;
}

@@ -186,7 +188,7 @@ static void dream_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)

if (v & int_mask) {
writeb(v & int_mask, DREAM_CPLD_BASE + stat_reg);
- printk(KERN_ERR "dream_gpio_irq_handler: got masked "
+ pr_err("got masked "
"interrupt: %d:%02x\n", bank, v & int_mask);
}

diff --git a/arch/arm/mach-msm/generic_gpio.c b/arch/arm/mach-msm/generic_gpio.c
index 5164c77..1175ffd 100644
--- a/arch/arm/mach-msm/generic_gpio.c
+++ b/arch/arm/mach-msm/generic_gpio.c
@@ -22,6 +22,8 @@

#include "gpio_chip.h"

+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
#define GPIO_NUM_TO_CHIP_INDEX(gpio) ((gpio)>>5)

struct gpio_state {
@@ -47,7 +49,7 @@ int register_gpio_chip(struct gpio_chip *new_gpio_chip)

new_gpio_chip->state = kzalloc(size, GFP_KERNEL);
if (new_gpio_chip->state == NULL) {
- printk(KERN_ERR "register_gpio_chip: failed to allocate state\n");
+ pr_err("failed to allocate state\n");
return -ENOMEM;
}

@@ -63,7 +65,7 @@ int register_gpio_chip(struct gpio_chip *new_gpio_chip)

new_array = kmalloc(array_size * sizeof(new_array[0]), GFP_ATOMIC);
if (!new_array) {
- printk(KERN_ERR "register_gpio_chip: failed to allocate array\n");
+ pr_err("failed to allocate array\n");
err = -ENOMEM;
goto failed;
}
@@ -81,7 +83,7 @@ int register_gpio_chip(struct gpio_chip *new_gpio_chip)
goto added;
}
if (gpio_chip->end >= new_gpio_chip->start) {
- printk(KERN_ERR "register_gpio_source %u-%u overlaps with %u-%u\n",
+ pr_err("%u-%u overlaps with %u-%u\n",
new_gpio_chip->start, new_gpio_chip->end,
gpio_chip->start, gpio_chip->end);
err = -EBUSY;

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


\
 
 \ /
  Last update: 2009-12-09 12:49    [W:0.122 / U:6.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site