The patch titled Subject: rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk() has been added to the -mm tree. Its filename is rtc-rtc-efi-use-dev_err-dev_warn-pr_err-instead-of-printk.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Jingoo Han <jg1.han@xxxxxxxxxxx> Subject: rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk() Fix the checkpatch warnings as below: WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... WARNING: please, no space before tabs Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-efi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff -puN drivers/rtc/rtc-efi.c~rtc-rtc-efi-use-dev_err-dev_warn-pr_err-instead-of-printk drivers/rtc/rtc-efi.c --- a/drivers/rtc/rtc-efi.c~rtc-rtc-efi-use-dev_err-dev_warn-pr_err-instead-of-printk +++ a/drivers/rtc/rtc-efi.c @@ -13,6 +13,8 @@ * */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/module.h> #include <linux/time.h> @@ -47,7 +49,7 @@ compute_wday(efi_time_t *eft) int ndays = 0; if (eft->year < 1998) { - printk(KERN_ERR "efirtc: EFI year < 1998, invalid date\n"); + pr_err("EFI year < 1998, invalid date\n"); return -1; } @@ -70,7 +72,7 @@ convert_to_efi_time(struct rtc_time *wti eft->day = wtime->tm_mday; eft->hour = wtime->tm_hour; eft->minute = wtime->tm_min; - eft->second = wtime->tm_sec; + eft->second = wtime->tm_sec; eft->nanosecond = 0; eft->daylight = wtime->tm_isdst ? EFI_ISDST : 0; eft->timezone = EFI_UNSPECIFIED_TIMEZONE; @@ -142,7 +144,7 @@ static int efi_set_alarm(struct device * */ status = efi.set_wakeup_time((efi_bool_t)wkalrm->enabled, &eft); - printk(KERN_WARNING "write status is %d\n", (int)status); + dev_warn(dev, "write status is %d\n", (int)status); return status == EFI_SUCCESS ? 0 : -EINVAL; } @@ -157,7 +159,7 @@ static int efi_read_time(struct device * if (status != EFI_SUCCESS) { /* should never happen */ - printk(KERN_ERR "efitime: can't read time\n"); + dev_err(dev, "can't read time\n"); return -EINVAL; } _ Patches currently in -mm which might be from jg1.han@xxxxxxxxxxx are linux-next.patch backlight-add-lms501kf03-lcd-driver.patch backlight-add-lms501kf03-lcd-driver-fix.patch backlight-add-lms501kf03-lcd-driver-fix-fix.patch backlight-ld9040-use-sleep-instead-of-delay.patch backlight-ld9040-remove-unnecessary-null-deference-check.patch backlight-ld9040-replace-efault-with-einval.patch backlight-ld9040-remove-redundant-return-variables.patch backlight-ld9040-reorder-inclusions-of-linux-xxxh.patch backlight-s6e63m0-use-lowercase-names-of-structs.patch backlight-s6e63m0-use-sleep-instead-of-delay.patch backlight-s6e63m0-remove-unnecessary-null-deference-check.patch backlight-s6e63m0-replace-efault-with-einval.patch backlight-s6e63m0-remove-redundant-variable-before_power.patch backlight-s6e63m0-reorder-inclusions-of-linux-xxxh.patch backlight-ams369fg06-use-sleep-instead-of-delay.patch backlight-ams369fg06-remove-unnecessary-null-deference-check.patch backlight-ams369fg06-replace-efault-with-einval.patch backlight-ams369fg06-remove-redundant-variable-before_power.patch backlight-ams369fg06-reorder-inclusions-of-linux-xxxh.patch backlight-l4f00242t03-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-ld9040-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-s6e63m0-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-ltv350qv-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-tdo24m-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-lms283gf05-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-ams369fg06-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-vgg2432a4-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-tosa-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-corgi_lcd-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-lms501kf03-use-spi_get_drvdata-and-spi_set_drvdata.patch backlight-aat2870-use-bl_get_data-instead-of-dev_get_drvdata.patch pwm_backlight-use-bl_get_data-instead-of-dev_get_drvdata.patch backlight-ams369fg06-use-bl_get_data-instead-of-dev_get_drvdata.patch backlight-corgi_lcd-use-bl_get_data-instead-of-dev_get_drvdata.patch backlight-tosa-use-bl_get_data-instead-of-dev_get_drvdata.patch backlight-omap1-use-bl_get_data-instead-of-dev_get_drvdata.patch backlight-corgi_lcd-use-lcd_get_data-instead-of-dev_get_drvdata.patch backlight-lm3649_backlight-remove-ret-=-eio-at-error-paths-of-probe.patch drivers-video-backlight-l4f00242t03c-convert-to-devm_regulator_get.patch fb-backlight-add-the-himax-hx-8357b-lcd-controller.patch fb-backlight-add-the-himax-hx-8357b-lcd-controller-change-parameters-of-the-write-function-to-u8.patch fb-backlight-add-the-himax-hx-8357b-lcd-controller-fix-inverted-parameters-for-kcalloc.patch fb-backlight-add-the-himax-hx-8357b-lcd-controller-remove-useless-error-message.patch fb-backlight-add-the-himax-hx-8357b-lcd-controller-remove-trailing-period.patch fb-backlight-add-the-himax-hx-8357b-lcd-controller-use-static-arrays-for-lcd-configuration.patch drivers-video-backlight-makefile-cleanup.patch backlight-add-an-as3711-pmic-backlight-driver.patch backlight-88pm860x_bl-add-missing-of_node_put.patch backlight-s6e63m0-report-gamma_table_count-correctly.patch drivers-video-backlight-lm3630_blc-remove-ret-=-eio-of-lm3630_backlight_register.patch rtc-max77686-add-missing-variable-initialization.patch rtc-max77686-add-missing-variable-initialization-fix.patch drivers-rtc-rtc-s3cc-use-dev_dbg-instaed-of-pr_debug.patch rtc-use-dev_warn-dev_dbg-pr_err-instead-of-printk.patch rtc-max77686-use-dev_info-instead-of-printk.patch rtc-rtc-efi-use-dev_err-dev_warn-pr_err-instead-of-printk.patch rtc-rtc-ds2404-use-dev_err-instead-of-printk.patch rtc-rtc-rs5c372-use-dev_dbg-dev_warn-instead-of-printk-pr_debug.patch rtc-rtc-at91rm9200-use-dev_dbg-dev_err-instead-of-printk-pr_debug.patch rtc-rtc-rs5c313-use-pr_err-instead-of-printk.patch rtc-rtc-vr41xx-use-dev_info-instead-of-printk.patch rtc-rtc-sun4v-use-pr_warn-instead-of-printk.patch rtc-rtc-pcf8583-use-dev_warn-instead-of-printk.patch rtc-rtc-cmos-use-dev_warn-dev_dbg-instead-of-printk-pr_debug.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