diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-02-04 21:01:21 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2013-02-06 19:00:43 -0500 |
commit | 4b07c5d5123f76487c61cf9dc3f987d0b8c88a94 (patch) | |
tree | 4728bcd9f5395655fab3a158a3dd7f2874959455 | |
parent | 61d4eb2724283e85b37ed2fe13390366d7a6db74 (diff) |
leds: leds-sunfire: use dev_err()/pr_err() instead of printk()
Fixed the checkpatch errors and warnings as below:
ERROR: spaces required around that '=' (ctx:VxW)
WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
-rw-r--r-- | drivers/leds/leds-sunfire.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/leds/leds-sunfire.c b/drivers/leds/leds-sunfire.c index 07ff5a3a6cee..89792990088d 100644 --- a/drivers/leds/leds-sunfire.c +++ b/drivers/leds/leds-sunfire.c | |||
@@ -3,6 +3,8 @@ | |||
3 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> | 3 | * Copyright (C) 2008 David S. Miller <davem@davemloft.net> |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
7 | |||
6 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
7 | #include <linux/module.h> | 9 | #include <linux/module.h> |
8 | #include <linux/init.h> | 10 | #include <linux/init.h> |
@@ -14,9 +16,6 @@ | |||
14 | #include <asm/fhc.h> | 16 | #include <asm/fhc.h> |
15 | #include <asm/upa.h> | 17 | #include <asm/upa.h> |
16 | 18 | ||
17 | #define DRIVER_NAME "leds-sunfire" | ||
18 | #define PFX DRIVER_NAME ": " | ||
19 | |||
20 | MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); | 19 | MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); |
21 | MODULE_DESCRIPTION("Sun Fire LED driver"); | 20 | MODULE_DESCRIPTION("Sun Fire LED driver"); |
22 | MODULE_LICENSE("GPL"); | 21 | MODULE_LICENSE("GPL"); |
@@ -130,14 +129,14 @@ static int sunfire_led_generic_probe(struct platform_device *pdev, | |||
130 | int i, err; | 129 | int i, err; |
131 | 130 | ||
132 | if (pdev->num_resources != 1) { | 131 | if (pdev->num_resources != 1) { |
133 | printk(KERN_ERR PFX "Wrong number of resources %d, should be 1\n", | 132 | dev_err(&pdev->dev, "Wrong number of resources %d, should be 1\n", |
134 | pdev->num_resources); | 133 | pdev->num_resources); |
135 | return -EINVAL; | 134 | return -EINVAL; |
136 | } | 135 | } |
137 | 136 | ||
138 | p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL); | 137 | p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL); |
139 | if (!p) { | 138 | if (!p) { |
140 | printk(KERN_ERR PFX "Could not allocate struct sunfire_drvdata\n"); | 139 | dev_err(&pdev->dev, "Could not allocate struct sunfire_drvdata\n"); |
141 | return -ENOMEM; | 140 | return -ENOMEM; |
142 | } | 141 | } |
143 | 142 | ||
@@ -152,7 +151,7 @@ static int sunfire_led_generic_probe(struct platform_device *pdev, | |||
152 | 151 | ||
153 | err = led_classdev_register(&pdev->dev, lp); | 152 | err = led_classdev_register(&pdev->dev, lp); |
154 | if (err) { | 153 | if (err) { |
155 | printk(KERN_ERR PFX "Could not register %s LED\n", | 154 | dev_err(&pdev->dev, "Could not register %s LED\n", |
156 | lp->name); | 155 | lp->name); |
157 | for (i--; i >= 0; i--) | 156 | for (i--; i >= 0; i--) |
158 | led_classdev_unregister(&p->leds[i].led_cdev); | 157 | led_classdev_unregister(&p->leds[i].led_cdev); |
@@ -188,7 +187,7 @@ static struct led_type clockboard_led_types[NUM_LEDS_PER_BOARD] = { | |||
188 | { | 187 | { |
189 | .name = "clockboard-right", | 188 | .name = "clockboard-right", |
190 | .handler = clockboard_right_set, | 189 | .handler = clockboard_right_set, |
191 | .default_trigger= "heartbeat", | 190 | .default_trigger = "heartbeat", |
192 | }, | 191 | }, |
193 | }; | 192 | }; |
194 | 193 | ||
@@ -209,7 +208,7 @@ static struct led_type fhc_led_types[NUM_LEDS_PER_BOARD] = { | |||
209 | { | 208 | { |
210 | .name = "fhc-right", | 209 | .name = "fhc-right", |
211 | .handler = fhc_right_set, | 210 | .handler = fhc_right_set, |
212 | .default_trigger= "heartbeat", | 211 | .default_trigger = "heartbeat", |
213 | }, | 212 | }, |
214 | }; | 213 | }; |
215 | 214 | ||
@@ -244,13 +243,13 @@ static int __init sunfire_leds_init(void) | |||
244 | int err = platform_driver_register(&sunfire_clockboard_led_driver); | 243 | int err = platform_driver_register(&sunfire_clockboard_led_driver); |
245 | 244 | ||
246 | if (err) { | 245 | if (err) { |
247 | printk(KERN_ERR PFX "Could not register clock board LED driver\n"); | 246 | pr_err("Could not register clock board LED driver\n"); |
248 | return err; | 247 | return err; |
249 | } | 248 | } |
250 | 249 | ||
251 | err = platform_driver_register(&sunfire_fhc_led_driver); | 250 | err = platform_driver_register(&sunfire_fhc_led_driver); |
252 | if (err) { | 251 | if (err) { |
253 | printk(KERN_ERR PFX "Could not register FHC LED driver\n"); | 252 | pr_err("Could not register FHC LED driver\n"); |
254 | platform_driver_unregister(&sunfire_clockboard_led_driver); | 253 | platform_driver_unregister(&sunfire_clockboard_led_driver); |
255 | } | 254 | } |
256 | 255 | ||