Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7ad33e74857f16f1202cbc5746faf52e88e8b376

Authored by Kay Sievers
Committed by Greg Kroah-Hartman
1 parent 6c7377ab68
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

video: struct device - replace bus_id with dev_name(), dev_set_name() 

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Showing 5 changed files with 21 additions and 19 deletions Side-by-side Diff

drivers/video/pmag-ba-fb.c
Diff comments   View file @ 7ad33e7
... ... @@ -151,7 +151,7 @@
151 151  
152 152 info = framebuffer_alloc(sizeof(struct pmagbafb_par), dev);
153 153 if (!info) {
154   - printk(KERN_ERR "%s: Cannot allocate memory\n", dev->bus_id);
  154 + printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));
155 155 return -ENOMEM;
156 156 }
157 157  
... ... @@ -160,7 +160,7 @@
160 160  
161 161 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
162 162 printk(KERN_ERR "%s: Cannot allocate color map\n",
163   - dev->bus_id);
  163 + dev_name(dev));
164 164 err = -ENOMEM;
165 165 goto err_alloc;
166 166 }
... ... @@ -173,8 +173,9 @@
173 173 /* Request the I/O MEM resource. */
174 174 start = tdev->resource.start;
175 175 len = tdev->resource.end - start + 1;
176   - if (!request_mem_region(start, len, dev->bus_id)) {
177   - printk(KERN_ERR "%s: Cannot reserve FB region\n", dev->bus_id);
  176 + if (!request_mem_region(start, len, dev_name(dev))) {
  177 + printk(KERN_ERR "%s: Cannot reserve FB region\n",
  178 + dev_name(dev));
178 179 err = -EBUSY;
179 180 goto err_cmap;
180 181 }
... ... @@ -183,7 +184,7 @@
183 184 info->fix.mmio_start = start;
184 185 par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
185 186 if (!par->mmio) {
186   - printk(KERN_ERR "%s: Cannot map MMIO\n", dev->bus_id);
  187 + printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
187 188 err = -ENOMEM;
188 189 goto err_resource;
189 190 }
... ... @@ -194,7 +195,7 @@
194 195 info->screen_base = ioremap_nocache(info->fix.smem_start,
195 196 info->fix.smem_len);
196 197 if (!info->screen_base) {
197   - printk(KERN_ERR "%s: Cannot map FB\n", dev->bus_id);
  198 + printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
198 199 err = -ENOMEM;
199 200 goto err_mmio_map;
200 201 }
201 202  
... ... @@ -205,14 +206,14 @@
205 206 err = register_framebuffer(info);
206 207 if (err < 0) {
207 208 printk(KERN_ERR "%s: Cannot register framebuffer\n",
208   - dev->bus_id);
  209 + dev_name(dev));
209 210 goto err_smem_map;
210 211 }
211 212  
212 213 get_device(dev);
213 214  
214 215 pr_info("fb%d: %s frame buffer device at %s\n",
215   - info->node, info->fix.id, dev->bus_id);
  216 + info->node, info->fix.id, dev_name(dev));
216 217  
217 218 return 0;
218 219  
drivers/video/pmagb-b-fb.c
Diff comments   View file @ 7ad33e7
... ... @@ -258,7 +258,7 @@
258 258  
259 259 info = framebuffer_alloc(sizeof(struct pmagbbfb_par), dev);
260 260 if (!info) {
261   - printk(KERN_ERR "%s: Cannot allocate memory\n", dev->bus_id);
  261 + printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));
262 262 return -ENOMEM;
263 263 }
264 264  
... ... @@ -267,7 +267,7 @@
267 267  
268 268 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
269 269 printk(KERN_ERR "%s: Cannot allocate color map\n",
270   - dev->bus_id);
  270 + dev_name(dev));
271 271 err = -ENOMEM;
272 272 goto err_alloc;
273 273 }
... ... @@ -280,8 +280,9 @@
280 280 /* Request the I/O MEM resource. */
281 281 start = tdev->resource.start;
282 282 len = tdev->resource.end - start + 1;
283   - if (!request_mem_region(start, len, dev->bus_id)) {
284   - printk(KERN_ERR "%s: Cannot reserve FB region\n", dev->bus_id);
  283 + if (!request_mem_region(start, len, dev_name(dev))) {
  284 + printk(KERN_ERR "%s: Cannot reserve FB region\n",
  285 + dev_name(dev));
285 286 err = -EBUSY;
286 287 goto err_cmap;
287 288 }
... ... @@ -290,7 +291,7 @@
290 291 info->fix.mmio_start = start;
291 292 par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);
292 293 if (!par->mmio) {
293   - printk(KERN_ERR "%s: Cannot map MMIO\n", dev->bus_id);
  294 + printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));
294 295 err = -ENOMEM;
295 296 goto err_resource;
296 297 }
... ... @@ -301,7 +302,7 @@
301 302 info->fix.smem_start = start + PMAGB_B_FBMEM;
302 303 par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);
303 304 if (!par->smem) {
304   - printk(KERN_ERR "%s: Cannot map FB\n", dev->bus_id);
  305 + printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));
305 306 err = -ENOMEM;
306 307 goto err_mmio_map;
307 308 }
... ... @@ -316,7 +317,7 @@
316 317 err = register_framebuffer(info);
317 318 if (err < 0) {
318 319 printk(KERN_ERR "%s: Cannot register framebuffer\n",
319   - dev->bus_id);
  320 + dev_name(dev));
320 321 goto err_smem_map;
321 322 }
322 323  
... ... @@ -328,7 +329,7 @@
328 329 par->osc1 / 1000, par->osc1 % 1000);
329 330  
330 331 pr_info("fb%d: %s frame buffer device at %s\n",
331   - info->node, info->fix.id, dev->bus_id);
  332 + info->node, info->fix.id, dev_name(dev));
332 333 pr_info("fb%d: Osc0: %s, Osc1: %s, Osc%u selected\n",
333 334 info->node, freq0, par->osc1 ? freq1 : "disabled",
334 335 par->osc1 != 0);
drivers/video/ps3fb.c
Diff comments   View file @ 7ad33e7
... ... @@ -1213,7 +1213,7 @@
1213 1213 dev->core.driver_data = info;
1214 1214  
1215 1215 dev_info(info->device, "%s %s, using %u KiB of video memory\n",
1216   - dev_driver_string(info->dev), info->dev->bus_id,
  1216 + dev_driver_string(info->dev), dev_name(info->dev),
1217 1217 info->fix.smem_len >> 10);
1218 1218  
1219 1219 task = kthread_run(ps3fbd, info, DEVICE_NAME);
drivers/video/sh_mobile_lcdcfb.c
Diff comments   View file @ 7ad33e7
... ... @@ -687,7 +687,7 @@
687 687 }
688 688  
689 689 error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED,
690   - pdev->dev.bus_id, priv);
  690 + dev_name(&pdev->dev), priv);
691 691 if (error) {
692 692 dev_err(&pdev->dev, "unable to request irq\n");
693 693 goto err1;
drivers/video/tmiofb.c
Diff comments   View file @ 7ad33e7
... ... @@ -751,7 +751,7 @@
751 751 }
752 752  
753 753 retval = request_irq(irq, &tmiofb_irq, IRQF_DISABLED,
754   - dev->dev.bus_id, info);
  754 + dev_name(&dev->dev), info);
755 755  
756 756 if (retval)
757 757 goto err_request_irq;