From: Michal Wilczynski <michal.wilczynski@intel.com>
To: linux-acpi@vger.kernel.org
Cc: rafael@kernel.org, dan.j.williams@intel.com,
vishal.l.verma@intel.com, lenb@kernel.org, dave.jiang@intel.com,
ira.weiny@intel.com, rui.zhang@intel.com,
linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev,
Michal Wilczynski <michal.wilczynski@intel.com>
Subject: [PATCH v7 2/9] acpi/bus: Set driver_data to NULL every time .add() fails
Date: Mon, 3 Jul 2023 11:02:45 +0300 [thread overview]
Message-ID: <20230703080252.2899090-3-michal.wilczynski@intel.com> (raw)
In-Reply-To: <20230703080252.2899090-1-michal.wilczynski@intel.com>
Most drivers set driver_data during .add() callback, but usually
they don't set it back to NULL in case of a failure. Set driver_data to
NULL in acpi_device_probe() to avoid code duplication.
Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
---
drivers/acpi/bus.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 2d6f1f45d44e..c087fd6e8398 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1014,8 +1014,10 @@ static int acpi_device_probe(struct device *dev)
return -ENOSYS;
ret = acpi_drv->ops.add(acpi_dev);
- if (ret)
+ if (ret) {
+ acpi_dev->driver_data = NULL;
return ret;
+ }
pr_debug("Driver [%s] successfully bound to device [%s]\n",
acpi_drv->name, acpi_dev->pnp.bus_id);
--
2.41.0
next prev parent reply other threads:[~2023-07-03 8:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-03 8:02 [PATCH v7 0/9] Remove .notify callback in acpi_device_ops Michal Wilczynski
2023-07-03 8:02 ` [PATCH v7 1/9] acpi/bus: Introduce wrappers for ACPICA event handler install/remove Michal Wilczynski
2023-07-03 8:02 ` Michal Wilczynski [this message]
2023-07-03 8:02 ` [PATCH v7 3/9] acpi/ac: Move handler installing logic to driver Michal Wilczynski
2023-07-03 8:02 ` [PATCH v7 4/9] acpi/video: " Michal Wilczynski
2023-07-03 8:02 ` [PATCH v7 5/9] acpi/battery: " Michal Wilczynski
2023-07-03 8:02 ` [PATCH v7 6/9] acpi/hed: " Michal Wilczynski
2023-07-03 8:02 ` [PATCH v7 7/9] acpi/nfit: " Michal Wilczynski
2023-07-13 15:21 ` Rafael J. Wysocki
2023-07-03 8:02 ` [PATCH v7 8/9] acpi/nfit: Remove unnecessary .remove callback Michal Wilczynski
2023-07-13 15:23 ` Rafael J. Wysocki
2023-07-03 8:02 ` [PATCH v7 9/9] acpi/thermal: Move handler installing logic to driver Michal Wilczynski
2023-07-14 17:03 ` [PATCH v7 0/9] Remove .notify callback in acpi_device_ops Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230703080252.2899090-3-michal.wilczynski@intel.com \
--to=michal.wilczynski@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).