From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-m68k@lists.linux-m68k.org
Subject: [PATCH 4/5] zorro: Simplify remove callback
Date: Tue, 27 Jul 2021 10:08:39 +0200 [thread overview]
Message-ID: <20210727080840.3550927-5-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20210727080840.3550927-1-u.kleine-koenig@pengutronix.de>
The driver core only calls a remove callback when the device was
successfully bound (aka probed) before. So dev->driver is never NULL.
(And even if it was NULL, to_zorro_driver(NULL) isn't ...)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/zorro/zorro-driver.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index c18524bb8b2a..ab06c9ce2c78 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -67,11 +67,9 @@ static void zorro_device_remove(struct device *dev)
struct zorro_dev *z = to_zorro_dev(dev);
struct zorro_driver *drv = to_zorro_driver(dev->driver);
- if (drv) {
- if (drv->remove)
- drv->remove(z);
- z->driver = NULL;
- }
+ if (drv->remove)
+ drv->remove(z);
+ z->driver = NULL;
}
--
2.30.2
next prev parent reply other threads:[~2021-07-27 8:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 8:08 [PATCH 0/5] Some cleanups after making bus_type::remove return void Uwe Kleine-König
2021-07-27 8:08 ` [PATCH 1/5] nubus: Simplify check in remove callback Uwe Kleine-König
2021-07-27 9:50 ` Finn Thain
2021-07-27 10:07 ` Geert Uytterhoeven
2021-07-27 10:19 ` Finn Thain
2021-07-27 11:42 ` Uwe Kleine-König
2021-07-31 10:32 ` Finn Thain
2021-07-31 12:05 ` Uwe Kleine-König
2021-07-27 8:08 ` [PATCH 2/5] nubus: Make struct nubus_driver::remove return void Uwe Kleine-König
2021-07-27 9:47 ` Finn Thain
2021-07-27 8:08 ` Uwe Kleine-König [this message]
2021-07-27 8:08 ` [PATCH 5/5] zorro: Drop useless (and hardly used) .driver member in struct zorro_dev Uwe Kleine-König
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=20210727080840.3550927-5-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
/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).