Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 343db4bd authored by Jingoo Han's avatar Jingoo Han Committed by Kukjin Kim
Browse files

gpio: samsung: use pr_* instead of printk 



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

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by/Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2b88ff4a

drivers/gpio/gpio-samsung.c

+6 −12
Original line number Diff line number Diff line
@@ -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)

{
@@ -602,7 +596,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;

}
@@ -630,7 +624,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;

}
@@ -674,7 +668,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;

}
@@ -709,7 +703,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;

}
@@ -929,10 +923,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. */