Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 63366d37ad5dbb4f208b517c88ea4bd41738dbf7

Authored by Joe Perches
Committed by Guenter Roeck
1 parent 55d705cce8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

hwmon: (lis3lv02d) Use pr_fmt and pr_<level> 

Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>

Showing 1 changed file with 11 additions and 12 deletions Side-by-side Diff

drivers/hwmon/lis3lv02d.c
Diff comments   View file @ 63366d3
... ... @@ -20,6 +20,8 @@
20 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 21 */
22 22  
  23 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  24 +
23 25 #include <linux/kernel.h>
24 26 #include <linux/init.h>
25 27 #include <linux/dmi.h>
... ... @@ -860,8 +862,7 @@
860 862 (p->irq_flags2 & IRQF_TRIGGER_MASK),
861 863 DRIVER_NAME, &lis3_dev);
862 864 if (err < 0)
863   - printk(KERN_ERR DRIVER_NAME
864   - "No second IRQ. Limited functionality\n");
  865 + pr_err("No second IRQ. Limited functionality\n");
865 866 }
866 867 }
867 868  
... ... @@ -879,7 +880,7 @@
879 880  
880 881 switch (dev->whoami) {
881 882 case WAI_12B:
882   - printk(KERN_INFO DRIVER_NAME ": 12 bits sensor found\n");
  883 + pr_info("12 bits sensor found\n");
883 884 dev->read_data = lis3lv02d_read_12;
884 885 dev->mdps_max_val = 2048;
885 886 dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B;
... ... @@ -890,7 +891,7 @@
890 891 dev->regs_size = ARRAY_SIZE(lis3_wai12_regs);
891 892 break;
892 893 case WAI_8B:
893   - printk(KERN_INFO DRIVER_NAME ": 8 bits sensor found\n");
  894 + pr_info("8 bits sensor found\n");
894 895 dev->read_data = lis3lv02d_read_8;
895 896 dev->mdps_max_val = 128;
896 897 dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
... ... @@ -901,7 +902,7 @@
901 902 dev->regs_size = ARRAY_SIZE(lis3_wai8_regs);
902 903 break;
903 904 case WAI_3DC:
904   - printk(KERN_INFO DRIVER_NAME ": 8 bits 3DC sensor found\n");
  905 + pr_info("8 bits 3DC sensor found\n");
905 906 dev->read_data = lis3lv02d_read_8;
906 907 dev->mdps_max_val = 128;
907 908 dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
... ... @@ -910,8 +911,7 @@
910 911 dev->scale = LIS3_SENSITIVITY_8B;
911 912 break;
912 913 default:
913   - printk(KERN_ERR DRIVER_NAME
914   - ": unknown sensor type 0x%X\n", dev->whoami);
  914 + pr_err("unknown sensor type 0x%X\n", dev->whoami);
915 915 return -EINVAL;
916 916 }
917 917  
... ... @@ -935,7 +935,7 @@
935 935 }
936 936  
937 937 if (lis3lv02d_joystick_enable())
938   - printk(KERN_ERR DRIVER_NAME ": joystick initialization failed\n");
  938 + pr_err("joystick initialization failed\n");
939 939  
940 940 /* passing in platform specific data is purely optional and only
941 941 * used by the SPI transport layer at the moment */
... ... @@ -957,8 +957,7 @@
957 957  
958 958 /* bail if we did not get an IRQ from the bus layer */
959 959 if (!dev->irq) {
960   - printk(KERN_ERR DRIVER_NAME
961   - ": No IRQ. Disabling /dev/freefall\n");
  960 + pr_err("No IRQ. Disabling /dev/freefall\n");
962 961 goto out;
963 962 }
964 963  
965 964  
... ... @@ -985,12 +984,12 @@
985 984 DRIVER_NAME, &lis3_dev);
986 985  
987 986 if (err < 0) {
988   - printk(KERN_ERR DRIVER_NAME "Cannot get IRQ\n");
  987 + pr_err("Cannot get IRQ\n");
989 988 goto out;
990 989 }
991 990  
992 991 if (misc_register(&lis3lv02d_misc_device))
993   - printk(KERN_ERR DRIVER_NAME ": misc_register failed\n");
  992 + pr_err("misc_register failed\n");
994 993 out:
995 994 return 0;
996 995 }