linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: rkir@google.com
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, tkjos@google.com,
	Roman Kiryanov <rkir@google.com>
Subject: [PATCH 07/15] platform: goldfish: pipe: Return status from "deinit" since "remove" does not do much
Date: Tue,  2 Oct 2018 15:18:55 -0700	[thread overview]
Message-ID: <20181002221903.19476-7-rkir@google.com> (raw)
In-Reply-To: <20181002221903.19476-1-rkir@google.com>

From: Roman Kiryanov <rkir@google.com>

This way deinit will have a chance to report an error.

Signed-off-by: Roman Kiryanov <rkir@google.com>
---
 drivers/platform/goldfish/goldfish_pipe.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 445c0c0c66c4..1822d4146778 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -888,13 +888,15 @@ static int goldfish_pipe_device_init(struct platform_device *pdev,
 	return 0;
 }
 
-static void goldfish_pipe_device_deinit(struct platform_device *pdev,
-					struct goldfish_pipe_dev *dev)
+static int goldfish_pipe_device_deinit(struct platform_device *pdev,
+				       struct goldfish_pipe_dev *dev)
 {
 	misc_deregister(&dev->miscdev);
 	tasklet_kill(&dev->irq_tasklet);
 	kfree(dev->pipes);
 	free_page((unsigned long)dev->buffers);
+
+	return 0;
 }
 
 static int goldfish_pipe_probe(struct platform_device *pdev)
@@ -941,8 +943,7 @@ static int goldfish_pipe_remove(struct platform_device *pdev)
 {
 	struct goldfish_pipe_dev *dev = platform_get_drvdata(pdev);
 
-	goldfish_pipe_device_deinit(pdev, dev);
-	return 0;
+	return goldfish_pipe_device_deinit(pdev, dev);
 }
 
 static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
-- 
2.19.0.605.g01d371f741-goog


  parent reply	other threads:[~2018-10-02 22:20 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-02 22:18 [PATCH 01/15] platform: goldfish: pipe: Remove the goldfish_interrupt_tasklet global variable rkir
2018-10-02 22:18 ` [PATCH 02/15] platform: goldfish: pipe: Remove the goldfish_pipe_miscdev " rkir
2018-10-02 22:18 ` [PATCH 03/15] platform: goldfish: pipe: Remove the goldfish_pipe_dev " rkir
2018-10-02 22:18 ` [PATCH 04/15] platform: goldfish: pipe: Call misc_deregister if init fails rkir
2018-10-02 22:18 ` [PATCH 05/15] platform: goldfish: pipe: Remove redundant casting rkir
2018-10-02 22:18 ` [PATCH 06/15] platform: goldfish: pipe: Move memory allocation from probe to init rkir
2018-10-02 22:18 ` rkir [this message]
2018-10-02 22:18 ` [PATCH 08/15] platform: goldfish: pipe: Add a blank line to separate varibles and code rkir
2018-10-02 22:18 ` [PATCH 09/15] platform: goldfish: pipe: Move goldfish_pipe to goldfish_pipe_v2 rkir
2018-10-02 22:18 ` [PATCH 10/15] platform: goldfish: pipe: Remove the license boilerplate rkir
2018-10-02 22:18 ` [PATCH 11/15] platform: goldfish: pipe: Split the driver to v2 specific and the rest rkir
2018-10-02 22:19 ` [PATCH 12/15] platform: goldfish: pipe: Rename the init function (add "v2") rkir
2018-10-02 22:19 ` [PATCH 13/15] platform: goldfish: pipe: Add a dedicated constant for the device name rkir
2018-10-02 22:19 ` [PATCH 14/15] platform: goldfish: pipe: Rename PIPE_REG to PIPE_V2_REG rkir
2018-10-02 22:19 ` [PATCH 15/15] platform: goldfish: pipe: Add the goldfish_pipe_v1 driver rkir
2018-10-02 22:30 ` [PATCH 01/15] platform: goldfish: pipe: Remove the goldfish_interrupt_tasklet global variable Greg KH
2018-10-02 22:33   ` Roman Kiryanov
2018-10-02 22:42     ` Greg KH

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=20181002221903.19476-7-rkir@google.com \
    --to=rkir@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tkjos@google.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).