Skip to content

Commit 01fd7cf

Browse files
Hans de Goedeij-intel
authored andcommitted
platform/x86: x86-android-tablets: Stop using EPROBE_DEFER
Since the x86-android-tablets code uses platform_create_bundle() it cannot use EPROBE_DEFER and the driver-core will translate EPROBE_DEFER to ENXIO. Stop using EPROBE_DEFER instead log an error and return ENODEV, or for non-fatal cases log a warning and return 0. Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Andy Shevchenko <andy@kernel.org> Signed-off-by: Hans de Goede <hansg@kernel.org> Link: https://patch.msgid.link/20250920200713.20193-21-hansg@kernel.org Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
1 parent 83fdf93 commit 01fd7cf

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/platform/x86/x86-android-tablets/core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,10 @@ get_serdev_controller_by_pci_parent(const struct x86_serdev_info *info)
276276
struct pci_dev *pdev;
277277

278278
pdev = pci_get_domain_bus_and_slot(0, 0, info->ctrl.pci.devfn);
279-
if (!pdev)
280-
return ERR_PTR(-EPROBE_DEFER);
279+
if (!pdev) {
280+
pr_err("error could not get PCI serdev at devfn 0x%02x\n", info->ctrl.pci.devfn);
281+
return ERR_PTR(-ENODEV);
282+
}
281283

282284
/* This puts our reference on pdev and returns a ref on the ctrl */
283285
return get_serdev_controller_from_parent(&pdev->dev, 0, info->ctrl_devname);

drivers/platform/x86/x86-android-tablets/other.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,8 +711,10 @@ static int __init vexia_edu_atla10_9v_init(struct device *dev)
711711

712712
/* Reprobe the SDIO controller to enumerate the now enabled Wifi module */
713713
pdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0x11, 0));
714-
if (!pdev)
715-
return -EPROBE_DEFER;
714+
if (!pdev) {
715+
pr_warn("Could not get PCI SDIO at devfn 0x%02x\n", PCI_DEVFN(0x11, 0));
716+
return 0;
717+
}
716718

717719
ret = device_reprobe(&pdev->dev);
718720
if (ret)

0 commit comments

Comments
 (0)