linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vineeth Vijayan <vneethv@linux.ibm.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Cc: kernel@pengutronix.de, Cornelia Huck <cohuck@redhat.com>,
	Heiko Carstens <hca@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	Peter Oberparleiter <oberpar@linux.ibm.com>,
	linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/4] s390/scm: Make struct scm_driver::remove return void
Date: Wed, 7 Jul 2021 13:32:11 +0200	[thread overview]
Message-ID: <b023ee41-3b86-bbe2-ac62-6cbf37992947@linux.ibm.com> (raw)
In-Reply-To: <20210706154803.1631813-4-u.kleine-koenig@pengutronix.de>

Looks sane to me.
Acked-by: Vineeth Vijayan <vneethv@linux.ibm.com>

Vasily/Heiko will pick this up for the next-s390-tree.


On 7/6/21 5:48 PM, Uwe Kleine-König wrote:
> The driver core ignores the return value of scmdev_remove()
> (because there is only little it can do when a device disappears).
>
> So make it impossible for future drivers to return an unused error code
> by changing the remove prototype to return void.
>
> The real motivation for this change is the quest to make struct
> bus_type::remove return void, too.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>   arch/s390/include/asm/eadm.h | 2 +-
>   drivers/s390/block/scm_drv.c | 4 +---
>   drivers/s390/cio/scm.c       | 5 ++++-
>   3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h
> index bb63b2afdf6f..445fe4c8184a 100644
> --- a/arch/s390/include/asm/eadm.h
> +++ b/arch/s390/include/asm/eadm.h
> @@ -105,7 +105,7 @@ enum scm_event {SCM_CHANGE, SCM_AVAIL};
>   struct scm_driver {
>   	struct device_driver drv;
>   	int (*probe) (struct scm_device *scmdev);
> -	int (*remove) (struct scm_device *scmdev);
> +	void (*remove) (struct scm_device *scmdev);
>   	void (*notify) (struct scm_device *scmdev, enum scm_event event);
>   	void (*handler) (struct scm_device *scmdev, void *data,
>   			blk_status_t error);
> diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c
> index 3134fd6e058e..69a845eb8b1f 100644
> --- a/drivers/s390/block/scm_drv.c
> +++ b/drivers/s390/block/scm_drv.c
> @@ -60,15 +60,13 @@ static int scm_probe(struct scm_device *scmdev)
>   	return ret;
>   }
>   
> -static int scm_remove(struct scm_device *scmdev)
> +static void scm_remove(struct scm_device *scmdev)
>   {
>   	struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);
>   
>   	scm_blk_dev_cleanup(bdev);
>   	dev_set_drvdata(&scmdev->dev, NULL);
>   	kfree(bdev);
> -
> -	return 0;
>   }
>   
>   static struct scm_driver scm_drv = {
> diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
> index 9f26d4310bb3..b31711307e5a 100644
> --- a/drivers/s390/cio/scm.c
> +++ b/drivers/s390/cio/scm.c
> @@ -33,7 +33,10 @@ static int scmdev_remove(struct device *dev)
>   	struct scm_device *scmdev = to_scm_dev(dev);
>   	struct scm_driver *scmdrv = to_scm_drv(dev->driver);
>   
> -	return scmdrv->remove ? scmdrv->remove(scmdev) : -ENODEV;
> +	if (scmdrv->remove)
> +		scmdrv->remove(scmdev);
> +
> +	return 0;
>   }
>   
>   static int scmdev_uevent(struct device *dev, struct kobj_uevent_env *env)

  parent reply	other threads:[~2021-07-07 11:32 UTC|newest]

Thread overview: 28+ 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 1/4] s390/cio: Make struct css_driver::remove " Uwe Kleine-König
2021-07-06 15:58   ` Cornelia Huck
2021-07-06 16:05     ` Uwe Kleine-König
2021-07-07 11:28       ` Vineeth Vijayan
2021-07-07 14:34         ` Uwe Kleine-König
2021-07-12 12:13           ` Heiko Carstens
2021-07-06 15:48 ` [PATCH v2 2/4] s390/ccwgroup: Drop if with an always false condition Uwe Kleine-König
2021-07-06 16:04   ` Cornelia Huck
2021-07-07 11:15   ` Vineeth Vijayan
2021-07-06 15:48 ` [PATCH v2 3/4] s390/scm: Make struct scm_driver::remove return void Uwe Kleine-König
2021-07-06 16:05   ` Cornelia Huck
2021-07-07 11:32   ` Vineeth Vijayan [this message]
2021-07-06 15:48 ` [PATCH v2 4/4] bus: Make remove callback " Uwe Kleine-König
2021-07-06 16:09   ` Cornelia Huck
2021-07-06 16:44   ` Rafael J. Wysocki
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  5:57   ` Stefan Richter
2021-07-07 14:24   ` Benjamin Tissoires
2021-07-07 21:51   ` Thorsten Scherer
2021-07-08 12:41   ` Ulf Hansson
2021-07-15 12:41   ` Wei Liu
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=b023ee41-3b86-bbe2-ac62-6cbf37992947@linux.ibm.com \
    --to=vneethv@linux.ibm.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=gor@linux.ibm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hca@linux.ibm.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=oberpar@linux.ibm.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /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).