The patch titled
cs5535-gpio: make printk usage consistent
has been added to the -mm tree. Its filename is
cs5535-gpio-request-function-mask-names-added-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cs5535-gpio: make printk usage consistent
From: Andres Salomon <dilinger@xxxxxxxxxxxxxxx>
Clean up places where we were using printk()s instead of dev_*.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxxxxxxx>
Cc: Tobias Mueller <Tobias_Mueller@xxxxxxxxx>
Cc: Takashi Iwai <tiwai@xxxxxxx>
Cc: Jordan Crouse <jordan@xxxxxxxxxxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Cc: Alessandro Zummo <alessandro.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpio/cs5535-gpio.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff -puN drivers/gpio/cs5535-gpio.c~cs5535-gpio-request-function-mask-names-added-fix drivers/gpio/cs5535-gpio.c
--- a/drivers/gpio/cs5535-gpio.c~cs5535-gpio-request-function-mask-names-added-fix
+++ a/drivers/gpio/cs5535-gpio.c
@@ -134,8 +134,8 @@ static int chip_gpio_request(struct gpio
/* check if this pin is available */
if ((mask & (1 << offset)) == 0) {
- printk(KERN_INFO DRV_NAME
- ": pin %u is not available (check mask)\n", offset);
+ dev_info(&chip->pdev->dev,
+ "pin %u is not available (check mask)\n", offset);
spin_unlock_irqrestore(&chip->lock, flags);
return -EINVAL;
}
@@ -265,18 +265,15 @@ static int __init cs5535_gpio_probe(stru
mask &= ~(1 << 28);
if (mask_orig != mask)
- printk(KERN_INFO DRV_NAME
- ": mask changed from 0x%08lX to 0x%08lX\n",
+ dev_info(&pdev->dev, "mask changed from 0x%08lX to 0x%08lX\n",
mask_orig, mask);
/* finally, register with the generic GPIO API */
err = gpiochip_add(&cs5535_gpio_chip.chip);
- if (err) {
- dev_err(&pdev->dev, "failed to register gpio chip\n");
+ if (err)
goto release_region;
- }
- printk(KERN_INFO DRV_NAME ": GPIO support successfully loaded.\n");
+ dev_info(&pdev->dev, DRV_NAME ": GPIO support successfully loaded.\n");
return 0;
release_region:
_
Patches currently in -mm which might be from dilinger@xxxxxxxxxxxxxxx are
linux-next.patch
cs5535-gpio-add-amd-cs5535-cs5536-gpio-driver-support.patch
cs5535-gpio-request-function-mask-names-added.patch
cs5535-gpio-request-function-mask-names-added-fix.patch
alsa-cs5535audio-free-olpc-quirks-from-reliance-on-mgeode_lx-cpu-optimization.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
