From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: nvdimm@lists.linux.dev, linux-hyperv@vger.kernel.org,
kvm@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-fpga@vger.kernel.org, linux-pci@vger.kernel.org,
alsa-devel@alsa-project.org, linux-cxl@vger.kernel.org,
platform-driver-x86@vger.kernel.org,
target-devel@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-i3c@lists.infradead.org,
linux1394-devel@lists.sourceforge.net,
linux-scsi@vger.kernel.org, linux-staging@lists.linux.dev,
linux-acpi@vger.kernel.org,
industrypack-devel@lists.sourceforge.net,
linux-input@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-sunxi@lists.linux.dev, linux-media@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org,
linux-remoteproc@vger.kernel.org, greybus-dev@lists.linaro.org,
virtualization@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linux-parisc@vger.kernel.org, netdev@vger.kernel.org,
linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-mips@vger.kernel.org, linux-spi@vger.kernel.org,
kernel@pengutronix.de, dmaengine@vger.kernel.org,
linux-ntb@googlegroups.com, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v2 4/4] bus: Make remove callback return void
Date: Tue, 6 Jul 2021 20:43:23 +0200 [thread overview]
Message-ID: <20210706184323.fudcbsiu4i34dojs@pengutronix.de> (raw)
In-Reply-To: <YOSb1+yeVeLxiSRc@yoga>
[-- Attachment #1.1: Type: text/plain, Size: 3365 bytes --]
Hello Bjorn,
On Tue, Jul 06, 2021 at 01:08:18PM -0500, Bjorn Andersson wrote:
> On Tue 06 Jul 10:48 CDT 2021, Uwe Kleine-K?nig wrote:
> > diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
> > index c1404d3dae2c..7f6fac618ab2 100644
> > --- a/drivers/rpmsg/rpmsg_core.c
> > +++ b/drivers/rpmsg/rpmsg_core.c
> > @@ -530,7 +530,7 @@ static int rpmsg_dev_probe(struct device *dev)
> > return err;
> > }
> >
> > -static int rpmsg_dev_remove(struct device *dev)
> > +static void rpmsg_dev_remove(struct device *dev)
> > {
> > struct rpmsg_device *rpdev = to_rpmsg_device(dev);
> > struct rpmsg_driver *rpdrv = to_rpmsg_driver(rpdev->dev.driver);
> > @@ -546,8 +546,6 @@ static int rpmsg_dev_remove(struct device *dev)
> >
> > if (rpdev->ept)
> > rpmsg_destroy_ept(rpdev->ept);
> > -
> > - return err;
>
> This leaves err assigned but never used, but I don't mind following up
> with a patch cleaning that up after this has landed.
Ah, good catch. If I send out a v3 I will fold the following into this
patch:
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
index 7f6fac618ab2..9151836190ce 100644
--- a/drivers/rpmsg/rpmsg_core.c
+++ b/drivers/rpmsg/rpmsg_core.c
@@ -534,10 +534,9 @@ static void rpmsg_dev_remove(struct device *dev)
{
struct rpmsg_device *rpdev = to_rpmsg_device(dev);
struct rpmsg_driver *rpdrv = to_rpmsg_driver(rpdev->dev.driver);
- int err = 0;
if (rpdev->ops->announce_destroy)
- err = rpdev->ops->announce_destroy(rpdev);
+ rpdev->ops->announce_destroy(rpdev);
if (rpdrv->remove)
rpdrv->remove(rpdev);
Maybe .announce_destroy() should then be changed to return void, too?
Something like:
diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h
index a76c344253bf..d5204756714c 100644
--- a/drivers/rpmsg/rpmsg_internal.h
+++ b/drivers/rpmsg/rpmsg_internal.h
@@ -40,7 +40,7 @@ struct rpmsg_device_ops {
struct rpmsg_channel_info chinfo);
int (*announce_create)(struct rpmsg_device *ept);
- int (*announce_destroy)(struct rpmsg_device *ept);
+ void (*announce_destroy)(struct rpmsg_device *ept);
};
/**
diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index 8e49a3bacfc7..4e05994634f8 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -340,7 +340,7 @@ static int virtio_rpmsg_announce_create(struct rpmsg_device *rpdev)
return err;
}
-static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)
+static void virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)
{
struct virtio_rpmsg_channel *vch = to_virtio_rpmsg_channel(rpdev);
struct virtproc_info *vrp = vch->vrp;
@@ -360,8 +360,6 @@ static int virtio_rpmsg_announce_destroy(struct rpmsg_device *rpdev)
if (err)
dev_err(dev, "failed to announce service %d\n", err);
}
-
- return err;
}
static const struct rpmsg_device_ops virtio_rpmsg_ops = {
though it's not obvious for me that the last hunk is sensible. (OTOH the
return code is ignored anyhow as rpmsg_dev_remove() is the only caller.
Best regards and thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 111 bytes --]
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
next prev parent reply other threads:[~2021-07-30 19:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 15:47 [PATCH v2 0/4] bus: Make remove callback return void Uwe Kleine-König
2021-07-06 15:48 ` [PATCH v2 4/4] " Uwe Kleine-König
2021-07-06 16:09 ` Cornelia Huck
2021-07-06 16:44 ` Rafael J. Wysocki
2021-07-06 18:08 ` Bjorn Andersson
2021-07-06 18:43 ` Uwe Kleine-König [this message]
2021-07-06 20:43 ` Bjorn Andersson
2021-07-06 18:15 ` Srinivas Pandruvada
2021-07-06 18:32 ` Uwe Kleine-König
2021-07-06 18:51 ` Dan Williams
2021-07-06 21:37 ` William Breathitt Gray
2021-07-07 14:24 ` Benjamin Tissoires
2021-07-07 21:51 ` Thorsten Scherer
2021-07-08 12:41 ` Ulf Hansson
2021-07-15 13:02 ` Thomas Bogendoerfer
2021-07-08 2:08 ` [PATCH v2 0/4] " Sven Van Asbroeck
2021-07-08 5:38 ` 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=20210706184323.fudcbsiu4i34dojs@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=bjorn.andersson@linaro.org \
--cc=dmaengine@vger.kernel.org \
--cc=greybus-dev@lists.linaro.org \
--cc=industrypack-devel@lists.sourceforge.net \
--cc=kernel@pengutronix.de \
--cc=kvm@vger.kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-i3c@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-ntb@googlegroups.com \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-sunxi@lists.linux.dev \
--cc=linux-usb@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=platform-driver-x86@vger.kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xenproject.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).