@@ -163,13 +163,13 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)
163
163
u32 reg ;
164
164
165
165
if (of_alias_from_compatible (node , info .type , sizeof (info .type )) < 0 ) {
166
- drm_err (host , "modalias failure on %pOF\n" , node );
166
+ dev_err (host -> dev , "modalias failure on %pOF\n" , node );
167
167
return ERR_PTR (- EINVAL );
168
168
}
169
169
170
170
ret = of_property_read_u32 (node , "reg" , & reg );
171
171
if (ret ) {
172
- drm_err (host , "device node %pOF has no valid reg property: %d\n" ,
172
+ dev_err (host -> dev , "device node %pOF has no valid reg property: %d\n" ,
173
173
node , ret );
174
174
return ERR_PTR (- EINVAL );
175
175
}
@@ -207,18 +207,18 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,
207
207
int ret ;
208
208
209
209
if (!info ) {
210
- drm_err (host , "invalid mipi_dsi_device_info pointer\n" );
210
+ dev_err (host -> dev , "invalid mipi_dsi_device_info pointer\n" );
211
211
return ERR_PTR (- EINVAL );
212
212
}
213
213
214
214
if (info -> channel > 3 ) {
215
- drm_err (host , "invalid virtual channel: %u\n" , info -> channel );
215
+ dev_err (host -> dev , "invalid virtual channel: %u\n" , info -> channel );
216
216
return ERR_PTR (- EINVAL );
217
217
}
218
218
219
219
dsi = mipi_dsi_device_alloc (host );
220
220
if (IS_ERR (dsi )) {
221
- drm_err (host , "failed to allocate DSI device %ld\n" ,
221
+ dev_err (host -> dev , "failed to allocate DSI device %ld\n" ,
222
222
PTR_ERR (dsi ));
223
223
return dsi ;
224
224
}
@@ -229,7 +229,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host,
229
229
230
230
ret = mipi_dsi_device_add (dsi );
231
231
if (ret ) {
232
- drm_err (host , "failed to add DSI device %d\n" , ret );
232
+ dev_err (host -> dev , "failed to add DSI device %d\n" , ret );
233
233
kfree (dsi );
234
234
return ERR_PTR (ret );
235
235
}
0 commit comments