Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpio: samsung: use pr_* instead of printk

Browse Source 
This patch uses pr_* instead of printk. Also, gpio_dbg
is replaced with pr_debug.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by/Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Jingoo Han 2012-10-23 23:12:23 +09:00 committed by Kukjin Kim
parent 2b88ff4a75
commit 343db4bda6
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpio/gpio-samsung.c
View File

@ -42,12 +42,6 @@
#include <plat/gpio-fns.h> #include <plat/gpio-fns.h>
#include <plat/pm.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, int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip,
unsigned int off, samsung_gpio_pull_t pull) unsigned int off, samsung_gpio_pull_t pull)
{ {
@ -602,7 +596,7 @@ static int samsung_gpiolib_4bit_input(struct gpio_chip *chip,
con &= ~(0xf << con_4bit_shift(offset)); con &= ~(0xf << con_4bit_shift(offset));
__raw_writel(con, base + GPIOCON_OFF); __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; return 0;
} }
@ -630,7 +624,7 @@ static int samsung_gpiolib_4bit_output(struct gpio_chip *chip,
__raw_writel(con, base + GPIOCON_OFF); __raw_writel(con, base + GPIOCON_OFF);
__raw_writel(dat, base + GPIODAT_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; return 0;
} }
@ -674,7 +668,7 @@ static int samsung_gpiolib_4bit2_input(struct gpio_chip *chip,
con &= ~(0xf << con_4bit_shift(offset)); con &= ~(0xf << con_4bit_shift(offset));
__raw_writel(con, regcon); __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; return 0;
} }
@ -709,7 +703,7 @@ static int samsung_gpiolib_4bit2_output(struct gpio_chip *chip,
__raw_writel(con, regcon); __raw_writel(con, regcon);
__raw_writel(dat, base + GPIODAT_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; return 0;
} }
@ -929,10 +923,10 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (chip->pm != NULL) { if (chip->pm != NULL) {
if (!chip->pm->save || !chip->pm->resume) 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); gc->label);
} else } 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 #endif
/* gpiochip_add() prints own failure message on error. */ /* gpiochip_add() prints own failure message on error. */