diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-22 09:04:35 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-26 07:10:02 -0500 |
commit | 5ed0a2c7eca3265e6df3e9eebedfc2db3916dcd4 (patch) | |
tree | 1384a26bb11cc3521705dc760012fe279a055d1b /drivers/media/common/siano/smsir.c | |
parent | 535bd1e96e6ea5eedd1171f0d4a7750597bb4cbf (diff) |
[media] siano: replace sms_err by pr_err
Originally, sms_err() would be also displaying the line where
the error occurs, but the messages are clear enough. Also,
the function is always printed. So, no need for it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/common/siano/smsir.c')
-rw-r--r-- | drivers/media/common/siano/smsir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/common/siano/smsir.c b/drivers/media/common/siano/smsir.c index 2dcae6ace282..2e0f96ff5594 100644 --- a/drivers/media/common/siano/smsir.c +++ b/drivers/media/common/siano/smsir.c | |||
@@ -59,10 +59,8 @@ int sms_ir_init(struct smscore_device_t *coredev) | |||
59 | 59 | ||
60 | sms_log("Allocating rc device"); | 60 | sms_log("Allocating rc device"); |
61 | dev = rc_allocate_device(); | 61 | dev = rc_allocate_device(); |
62 | if (!dev) { | 62 | if (!dev) |
63 | sms_err("Not enough memory"); | ||
64 | return -ENOMEM; | 63 | return -ENOMEM; |
65 | } | ||
66 | 64 | ||
67 | coredev->ir.controller = 0; /* Todo: vega/nova SPI number */ | 65 | coredev->ir.controller = 0; /* Todo: vega/nova SPI number */ |
68 | coredev->ir.timeout = IR_DEFAULT_TIMEOUT; | 66 | coredev->ir.timeout = IR_DEFAULT_TIMEOUT; |
@@ -97,7 +95,7 @@ int sms_ir_init(struct smscore_device_t *coredev) | |||
97 | 95 | ||
98 | err = rc_register_device(dev); | 96 | err = rc_register_device(dev); |
99 | if (err < 0) { | 97 | if (err < 0) { |
100 | sms_err("Failed to register device"); | 98 | pr_err("Failed to register device\n"); |
101 | rc_free_device(dev); | 99 | rc_free_device(dev); |
102 | return err; | 100 | return err; |
103 | } | 101 | } |