This patch uses pr_* instead of printk. Also, gpio_dbg
is replaced with pr_debug.
Signed-off-by: Ryan Mallon <[email protected]>
Signed-off-by: Jingoo Han <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
---
drivers/gpio/gpio-samsung.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index a006f0d..5c5ccdf 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -42,12 +42,6 @@
#include <plat/gpio-fns.h>
#include <plat/pm.h>
-#ifndef DEBUG_GPIO
-#define gpio_dbg(x...) do { } while (0)
-#else
-#define gpio_dbg(x...) printk(KERN_DEBUG x)
-#endif
-
int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
unsigned int off, samsung_gpio_pull_t pull)
{
@@ -599,7 +593,7 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
con &= ~(0xf << con_4bit_shift(offset));
__raw_writel(con, base + GPIOCON_OFF);
- gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
+ pr_debug("%s: %p: CON now %08lx\n", __func__, base, con);
return 0;
}
@@ -627,7 +621,7 @@ static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
__raw_writel(con, base + GPIOCON_OFF);
__raw_writel(dat, base + GPIODAT_OFF);
- gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
+ pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
return 0;
}
@@ -671,7 +665,7 @@ static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
con &= ~(0xf << con_4bit_shift(offset));
__raw_writel(con, regcon);
- gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);
+ pr_debug("%s: %p: CON %08lx\n", __func__, base, con);
return 0;
}
@@ -706,7 +700,7 @@ static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
__raw_writel(con, regcon);
__raw_writel(dat, base + GPIODAT_OFF);
- gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
+ pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
return 0;
}
@@ -926,10 +920,10 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
#ifdef CONFIG_PM
if (chip->pm != NULL) {
if (!chip->pm->save || !chip->pm->resume)
- printk(KERN_ERR "gpio: %s has missing PM functions\n",
+ pr_err("gpio: %s has missing PM functions\n",
gc->label);
} else
- printk(KERN_ERR "gpio: %s has no PM function\n", gc->label);
+ pr_err("gpio: %s has no PM function\n", gc->label);
#endif
/* gpiochip_add() prints own failure message on error. */
--
1.7.1
On 16/10/12 19:25, Jingoo Han wrote:
> This patch uses pr_* instead of printk. Also, gpio_dbg
> is replaced with pr_debug.
>
> Signed-off-by: Ryan Mallon <[email protected]>
If I recall correctly, I only offered review comments on this patch,
I wasn't directly involved in writing it, or in the submission
process, so you don't need to have my signed-off-by here. It's also
generally considered impolite to add someone's signed-off-by without
asking for permission. I don't mind either way, but you don't need
my tag since you wrote the patch, I only provided feedback.
Thanks,
~Ryan
> Signed-off-by: Jingoo Han <[email protected]>
> Reviewed-by: Linus Walleij <[email protected]>
> ---
> drivers/gpio/gpio-samsung.c | 18 ++++++------------
> 1 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
> index a006f0d..5c5ccdf 100644
> --- a/drivers/gpio/gpio-samsung.c
> +++ b/drivers/gpio/gpio-samsung.c
> @@ -42,12 +42,6 @@
> #include <plat/gpio-fns.h>
> #include <plat/pm.h>
>
> -#ifndef DEBUG_GPIO
> -#define gpio_dbg(x...) do { } while (0)
> -#else
> -#define gpio_dbg(x...) printk(KERN_DEBUG x)
> -#endif
> -
> int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
> unsigned int off, samsung_gpio_pull_t pull)
> {
> @@ -599,7 +593,7 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
> con &= ~(0xf << con_4bit_shift(offset));
> __raw_writel(con, base + GPIOCON_OFF);
>
> - gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
> + pr_debug("%s: %p: CON now %08lx\n", __func__, base, con);
>
> return 0;
> }
> @@ -627,7 +621,7 @@ static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
> __raw_writel(con, base + GPIOCON_OFF);
> __raw_writel(dat, base + GPIODAT_OFF);
>
> - gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
> + pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
>
> return 0;
> }
> @@ -671,7 +665,7 @@ static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
> con &= ~(0xf << con_4bit_shift(offset));
> __raw_writel(con, regcon);
>
> - gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);
> + pr_debug("%s: %p: CON %08lx\n", __func__, base, con);
>
> return 0;
> }
> @@ -706,7 +700,7 @@ static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
> __raw_writel(con, regcon);
> __raw_writel(dat, base + GPIODAT_OFF);
>
> - gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
> + pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
>
> return 0;
> }
> @@ -926,10 +920,10 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
> #ifdef CONFIG_PM
> if (chip->pm != NULL) {
> if (!chip->pm->save || !chip->pm->resume)
> - printk(KERN_ERR "gpio: %s has missing PM functions\n",
> + pr_err("gpio: %s has missing PM functions\n",
> gc->label);
> } else
> - printk(KERN_ERR "gpio: %s has no PM function\n", gc->label);
> + pr_err("gpio: %s has no PM function\n", gc->label);
> #endif
>
> /* gpiochip_add() prints own failure message on error. */
On Tue, Oct 16, 2012 at 10:25 AM, Jingoo Han <[email protected]> wrote:
> int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
> unsigned int off, samsung_gpio_pull_t pull)
> {
> @@ -599,7 +593,7 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
> con &= ~(0xf << con_4bit_shift(offset));
> __raw_writel(con, base + GPIOCON_OFF);
>
> - gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
> + pr_debug("%s: %p: CON now %08lx\n", __func__, base, con);
Does your struct gpio_chip provide a valid dev pointer so you can use:
dev_dbg(chip->dev, "%s: %p: CON now %08lx\n", __func__, base, con);
In that case use the dev_* print macros everywhere instead.
Yours,
Linus Walleij
On Tuesday, October 16, 2012 6:43 PM Ryan Mallon wrote
>
> On 16/10/12 19:25, Jingoo Han wrote:
>
> > This patch uses pr_* instead of printk. Also, gpio_dbg
> > is replaced with pr_debug.
> >
> > Signed-off-by: Ryan Mallon <[email protected]>
>
>
> If I recall correctly, I only offered review comments on this patch,
> I wasn't directly involved in writing it, or in the submission
> process, so you don't need to have my signed-off-by here. It's also
> generally considered impolite to add someone's signed-off-by without
> asking for permission. I don't mind either way, but you don't need
> my tag since you wrote the patch, I only provided feedback.
Sorry, it's my fault.
I will remove your signed-off-by, and will send v3 patch.
Thank you for letting me know.
Best regards,
Jingoo Han
>
> Thanks,
> ~Ryan
>
> > Signed-off-by: Jingoo Han <[email protected]>
> > Reviewed-by: Linus Walleij <[email protected]>
> > ---
> > drivers/gpio/gpio-samsung.c | 18 ++++++------------
> > 1 files changed, 6 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
> > index a006f0d..5c5ccdf 100644
> > --- a/drivers/gpio/gpio-samsung.c
> > +++ b/drivers/gpio/gpio-samsung.c
> > @@ -42,12 +42,6 @@
> > #include <plat/gpio-fns.h>
> > #include <plat/pm.h>
> >
> > -#ifndef DEBUG_GPIO
> > -#define gpio_dbg(x...) do { } while (0)
> > -#else
> > -#define gpio_dbg(x...) printk(KERN_DEBUG x)
> > -#endif
> > -
> > int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
> > unsigned int off, samsung_gpio_pull_t pull)
> > {
> > @@ -599,7 +593,7 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
> > con &= ~(0xf << con_4bit_shift(offset));
> > __raw_writel(con, base + GPIOCON_OFF);
> >
> > - gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
> > + pr_debug("%s: %p: CON now %08lx\n", __func__, base, con);
> >
> > return 0;
> > }
> > @@ -627,7 +621,7 @@ static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
> > __raw_writel(con, base + GPIOCON_OFF);
> > __raw_writel(dat, base + GPIODAT_OFF);
> >
> > - gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
> > + pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
> >
> > return 0;
> > }
> > @@ -671,7 +665,7 @@ static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
> > con &= ~(0xf << con_4bit_shift(offset));
> > __raw_writel(con, regcon);
> >
> > - gpio_dbg("%s: %p: CON %08lx\n", __func__, base, con);
> > + pr_debug("%s: %p: CON %08lx\n", __func__, base, con);
> >
> > return 0;
> > }
> > @@ -706,7 +700,7 @@ static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
> > __raw_writel(con, regcon);
> > __raw_writel(dat, base + GPIODAT_OFF);
> >
> > - gpio_dbg("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
> > + pr_debug("%s: %p: CON %08lx, DAT %08lx\n", __func__, base, con, dat);
> >
> > return 0;
> > }
> > @@ -926,10 +920,10 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
> > #ifdef CONFIG_PM
> > if (chip->pm != NULL) {
> > if (!chip->pm->save || !chip->pm->resume)
> > - printk(KERN_ERR "gpio: %s has missing PM functions\n",
> > + pr_err("gpio: %s has missing PM functions\n",
> > gc->label);
> > } else
> > - printk(KERN_ERR "gpio: %s has no PM function\n", gc->label);
> > + pr_err("gpio: %s has no PM function\n", gc->label);
> > #endif
> >
> > /* gpiochip_add() prints own failure message on error. */
On Wednesday, October 17, 2012 2:33 AM Linus Walleij wrote:
>
> On Tue, Oct 16, 2012 at 10:25 AM, Jingoo Han <[email protected]> wrote:
>
> > int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
> > unsigned int off, samsung_gpio_pull_t pull)
> > {
> > @@ -599,7 +593,7 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
> > con &= ~(0xf << con_4bit_shift(offset));
> > __raw_writel(con, base + GPIOCON_OFF);
> >
> > - gpio_dbg("%s: %p: CON now %08lx\n", __func__, base, con);
> > + pr_debug("%s: %p: CON now %08lx\n", __func__, base, con);
>
> Does your struct gpio_chip provide a valid dev pointer so you can use:
>
> dev_dbg(chip->dev, "%s: %p: CON now %08lx\n", __func__, base, con);
>
> In that case use the dev_* print macros everywhere instead.
>
No, a valid dev pointer is not provided yet.
After a valid dev pointer is available, I will change
pr_debug to dev_dbg.
Best regards,
Jingoo Han
> Yours,
> Linus Walleij
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html