Skip to content

Commit d920b37

Browse files
Hongbo LiHans Verkuil
authored andcommitted
media: intel/ipu6: make use of dev_err_cast_probe()
Using dev_err_cast_probe() to simplify the code. No functional change. Signed-off-by: Hongbo Li <lihongbo22@huawei.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
1 parent 719ec29 commit d920b37

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

  • drivers/media/pci/intel/ipu6

drivers/media/pci/intel/ipu6/ipu6.c

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,20 +390,18 @@ ipu6_isys_init(struct pci_dev *pdev, struct device *parent,
390390
isys_adev = ipu6_bus_initialize_device(pdev, parent, pdata, ctrl,
391391
IPU6_ISYS_NAME);
392392
if (IS_ERR(isys_adev)) {
393-
dev_err_probe(dev, PTR_ERR(isys_adev),
394-
"ipu6_bus_initialize_device isys failed\n");
395393
kfree(pdata);
396-
return ERR_CAST(isys_adev);
394+
return dev_err_cast_probe(dev, isys_adev,
395+
"ipu6_bus_initialize_device isys failed\n");
397396
}
398397

399398
isys_adev->mmu = ipu6_mmu_init(dev, base, ISYS_MMID,
400399
&ipdata->hw_variant);
401400
if (IS_ERR(isys_adev->mmu)) {
402-
dev_err_probe(dev, PTR_ERR(isys_adev->mmu),
403-
"ipu6_mmu_init(isys_adev->mmu) failed\n");
404401
put_device(&isys_adev->auxdev.dev);
405402
kfree(pdata);
406-
return ERR_CAST(isys_adev->mmu);
403+
return dev_err_cast_probe(dev, isys_adev->mmu,
404+
"ipu6_mmu_init(isys_adev->mmu) failed\n");
407405
}
408406

409407
isys_adev->mmu->dev = &isys_adev->auxdev.dev;
@@ -436,20 +434,18 @@ ipu6_psys_init(struct pci_dev *pdev, struct device *parent,
436434
psys_adev = ipu6_bus_initialize_device(pdev, parent, pdata, ctrl,
437435
IPU6_PSYS_NAME);
438436
if (IS_ERR(psys_adev)) {
439-
dev_err_probe(&pdev->dev, PTR_ERR(psys_adev),
440-
"ipu6_bus_initialize_device psys failed\n");
441437
kfree(pdata);
442-
return ERR_CAST(psys_adev);
438+
return dev_err_cast_probe(&pdev->dev, psys_adev,
439+
"ipu6_bus_initialize_device psys failed\n");
443440
}
444441

445442
psys_adev->mmu = ipu6_mmu_init(&pdev->dev, base, PSYS_MMID,
446443
&ipdata->hw_variant);
447444
if (IS_ERR(psys_adev->mmu)) {
448-
dev_err_probe(&pdev->dev, PTR_ERR(psys_adev->mmu),
449-
"ipu6_mmu_init(psys_adev->mmu) failed\n");
450445
put_device(&psys_adev->auxdev.dev);
451446
kfree(pdata);
452-
return ERR_CAST(psys_adev->mmu);
447+
return dev_err_cast_probe(&pdev->dev, psys_adev->mmu,
448+
"ipu6_mmu_init(psys_adev->mmu) failed\n");
453449
}
454450

455451
psys_adev->mmu->dev = &psys_adev->auxdev.dev;

0 commit comments

Comments
 (0)