diff options
Diffstat (limited to 'arch/arm/mach-omap2/sr_device.c')
-rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index d033a65f4e4e..f8217a5a4a26 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c | |||
@@ -104,16 +104,15 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
104 | 104 | ||
105 | sr_data = kzalloc(sizeof(struct omap_sr_data), GFP_KERNEL); | 105 | sr_data = kzalloc(sizeof(struct omap_sr_data), GFP_KERNEL); |
106 | if (!sr_data) { | 106 | if (!sr_data) { |
107 | pr_err("%s: Unable to allocate memory for %s sr_data.Error!\n", | 107 | pr_err("%s: Unable to allocate memory for %s sr_data\n", |
108 | __func__, oh->name); | 108 | __func__, oh->name); |
109 | return -ENOMEM; | 109 | return -ENOMEM; |
110 | } | 110 | } |
111 | 111 | ||
112 | sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr; | 112 | sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr; |
113 | if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) { | 113 | if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) { |
114 | pr_err("%s: No voltage domain specified for %s." | 114 | pr_err("%s: No voltage domain specified for %s. Cannot initialize\n", |
115 | "Cannot initialize\n", __func__, | 115 | __func__, oh->name); |
116 | oh->name); | ||
117 | goto exit; | 116 | goto exit; |
118 | } | 117 | } |
119 | 118 | ||
@@ -123,7 +122,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
123 | sr_data->senp_mod = 0x1; | 122 | sr_data->senp_mod = 0x1; |
124 | 123 | ||
125 | sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name); | 124 | sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name); |
126 | if (IS_ERR(sr_data->voltdm)) { | 125 | if (!sr_data->voltdm) { |
127 | pr_err("%s: Unable to get voltage domain pointer for VDD %s\n", | 126 | pr_err("%s: Unable to get voltage domain pointer for VDD %s\n", |
128 | __func__, sr_dev_attr->sensor_voltdm_name); | 127 | __func__, sr_dev_attr->sensor_voltdm_name); |
129 | goto exit; | 128 | goto exit; |
@@ -131,8 +130,8 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
131 | 130 | ||
132 | omap_voltage_get_volttable(sr_data->voltdm, &volt_data); | 131 | omap_voltage_get_volttable(sr_data->voltdm, &volt_data); |
133 | if (!volt_data) { | 132 | if (!volt_data) { |
134 | pr_warning("%s: No Voltage table registered fo VDD%d." | 133 | pr_err("%s: No Voltage table registered for VDD%d\n", |
135 | "Something really wrong\n\n", __func__, i + 1); | 134 | __func__, i + 1); |
136 | goto exit; | 135 | goto exit; |
137 | } | 136 | } |
138 | 137 | ||