AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-15 15:26:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

sh-pfc: Convert message printing from pr_* to dev_*

Browse Source 
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Laurent Pinchart 2013-03-10 18:00:02 +01:00
parent 9fddc4a589
commit 9a643c9a11
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pinctrl/sh-pfc/core.c
View File

@ -10,7 +10,6 @@
*/ */
#define DRV_NAME "sh-pfc" #define DRV_NAME "sh-pfc"
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/err.h> #include <linux/err.h>
@ -173,9 +172,9 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc,
sh_pfc_config_reg_helper(pfc, crp, field, &mapped_reg, &mask, &pos); sh_pfc_config_reg_helper(pfc, crp, field, &mapped_reg, &mask, &pos);
pr_debug("write_reg addr = %lx, value = %ld, field = %ld, " dev_dbg(pfc->dev, "write_reg addr = %lx, value = %ld, field = %ld, "
"r_width = %ld, f_width = %ld\n", "r_width = %ld, f_width = %ld\n",
crp->reg, value, field, crp->reg_width, crp->field_width); crp->reg, value, field, crp->reg_width, crp->field_width);
mask = ~(mask << pos); mask = ~(mask << pos);
value = value << pos; value = value << pos;
@ -254,7 +253,8 @@ static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, pinmux_enum_t mark, int pos,
} }
} }
pr_err("cannot locate data/mark enum_id for mark %d\n", mark); dev_err(pfc->dev, "cannot locate data/mark enum_id for mark %d\n",
mark);
return -EINVAL; return -EINVAL;
} }
@ -396,13 +396,13 @@ static int sh_pfc_probe(struct platform_device *pdev)
* PFC state as it is, given that there are already * PFC state as it is, given that there are already
* extant users of it that have succeeded by this point. * extant users of it that have succeeded by this point.
*/ */
pr_notice("failed to init GPIO chip, ignoring...\n"); dev_notice(pfc->dev, "failed to init GPIO chip, ignoring...\n");
} }
#endif #endif
platform_set_drvdata(pdev, pfc); platform_set_drvdata(pdev, pfc);
pr_info("%s support registered\n", info->name); dev_info(pfc->dev, "%s support registered\n", info->name);
return 0; return 0;
} }

16
drivers/pinctrl/sh-pfc/gpio.c
View File

@ -9,8 +9,6 @@
* for more details. * for more details.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME " gpio: " fmt
#include <linux/device.h> #include <linux/device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/init.h> #include <linux/init.h>
@ -273,12 +271,18 @@ static int gpio_pin_setup(struct sh_pfc_chip *chip)
static int gpio_function_request(struct gpio_chip *gc, unsigned offset) static int gpio_function_request(struct gpio_chip *gc, unsigned offset)
{ {
static bool __print_once;
struct sh_pfc *pfc = gpio_to_pfc(gc); struct sh_pfc *pfc = gpio_to_pfc(gc);
unsigned int mark = pfc->info->func_gpios[offset].enum_id; unsigned int mark = pfc->info->func_gpios[offset].enum_id;
unsigned long flags; unsigned long flags;
int ret; int ret;
pr_notice_once("Use of GPIO API for function requests is deprecated, convert to pinctrl\n"); if (!__print_once) {
dev_notice(pfc->dev,
"Use of GPIO API for function requests is deprecated."
" Convert to pinctrl\n");
__print_once = true;
}
if (mark == 0) if (mark == 0)
return -EINVAL; return -EINVAL;
@ -334,9 +338,9 @@ sh_pfc_add_gpiochip(struct sh_pfc *pfc, int(*setup)(struct sh_pfc_chip *))
if (unlikely(ret < 0)) if (unlikely(ret < 0))
return ERR_PTR(ret); return ERR_PTR(ret);
pr_info("%s handling gpio %u -> %u\n", dev_info(pfc->dev, "%s handling gpio %u -> %u\n",
chip->gpio_chip.label, chip->gpio_chip.base, chip->gpio_chip.label, chip->gpio_chip.base,
chip->gpio_chip.base + chip->gpio_chip.ngpio - 1); chip->gpio_chip.base + chip->gpio_chip.ngpio - 1);
return chip; return chip;
} }

5
drivers/pinctrl/sh-pfc/pinctrl.c
View File

@ -9,7 +9,6 @@
*/ */
#define DRV_NAME "sh-pfc" #define DRV_NAME "sh-pfc"
#define pr_fmt(fmt) KBUILD_MODNAME " pinctrl: " fmt
#include <linux/device.h> #include <linux/device.h>
#include <linux/err.h> #include <linux/err.h>
@ -176,7 +175,9 @@ static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev,
spin_lock_irqsave(&pfc->lock, flags); spin_lock_irqsave(&pfc->lock, flags);
if (cfg->type != PINMUX_TYPE_NONE) { if (cfg->type != PINMUX_TYPE_NONE) {
pr_err("Pin %u is busy, can't configure it as GPIO.\n", offset); dev_err(pfc->dev,
"Pin %u is busy, can't configure it as GPIO.\n",
offset);
ret = -EBUSY; ret = -EBUSY;
goto done; goto done;
} }