From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
William Breathitt Gray <vilhelm.gray@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Pau Oliva Fora <pof@eslack.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
Hannes Reinecke <hare@suse.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Finn Thain <fthain@telegraphics.com.au>,
Michael Schmitz <schmitzmic@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-input@vger.kernel.org,
linux-media@vger.kernel.org, linux-can@vger.kernel.org,
netdev@vger.kernel.org, linux-scsi@vger.kernel.org,
alsa-devel@alsa-project.org
Subject: [PATCH v2 0/3] isa: Make the remove callback for isa drivers return void
Date: Fri, 22 Jan 2021 10:24:46 +0100 [thread overview]
Message-ID: <20210122092449.426097-1-uwe@kleine-koenig.org> (raw)
Hello,
changes since v1
(https://lore.kernel.org/r/20210121204812.402589-1-uwe@kleine-koenig.org):
- fix build failure, found by the kernel test robot
(my grep missed the struct isa_driver embedded in struct
radio_isa_driver). For this I introduced patch 2 and adapted patch 3
a bit. An interdiff is below.
- Added Acks/Reviews by Guenter Roeck, William Breathitt Gray, Marc
Kleine-Budde, Wolfram Sang and Takashi Iwai <tiwai@suse.de>
The base-commit I specified (by hand *sigh*) in v1 was broken, must be a
cut-n-paste-error, sorry for that.
Takashi suggested to take this series via sound.git given that this is
the most affected tree. This is fine for me. Otherwise I can also
provide an immutable branch. For both variants we still need a few acks
though.
Best regards
Uwe
Uwe Kleine-König (3):
watchdog: pcwd: drop always-false if from remove callback
media/radio: Make radio_isa_common_remove() return void
isa: Make the remove callback for isa drivers return void
drivers/base/isa.c | 2 +-
drivers/i2c/busses/i2c-elektor.c | 4 +---
drivers/i2c/busses/i2c-pca-isa.c | 4 +---
drivers/input/touchscreen/htcpen.c | 4 +---
drivers/media/radio/radio-isa.c | 9 ++++-----
drivers/media/radio/radio-isa.h | 2 +-
drivers/media/radio/radio-sf16fmr2.c | 4 +---
drivers/net/can/sja1000/tscan1.c | 4 +---
drivers/net/ethernet/3com/3c509.c | 3 +--
drivers/scsi/advansys.c | 3 +--
drivers/scsi/aha1542.c | 3 +--
drivers/scsi/fdomain_isa.c | 3 +--
drivers/scsi/g_NCR5380.c | 5 ++---
drivers/watchdog/pcwd.c | 7 +------
include/linux/isa.h | 2 +-
sound/isa/ad1848/ad1848.c | 3 +--
sound/isa/adlib.c | 3 +--
sound/isa/cmi8328.c | 3 +--
sound/isa/cmi8330.c | 3 +--
sound/isa/cs423x/cs4231.c | 3 +--
sound/isa/cs423x/cs4236.c | 3 +--
sound/isa/es1688/es1688.c | 3 +--
sound/isa/es18xx.c | 5 ++---
sound/isa/galaxy/galaxy.c | 3 +--
sound/isa/gus/gusclassic.c | 3 +--
sound/isa/gus/gusextreme.c | 3 +--
sound/isa/gus/gusmax.c | 3 +--
sound/isa/gus/interwave.c | 3 +--
sound/isa/msnd/msnd_pinnacle.c | 3 +--
sound/isa/opl3sa2.c | 3 +--
sound/isa/opti9xx/miro.c | 3 +--
sound/isa/opti9xx/opti92x-ad1848.c | 5 ++---
sound/isa/sb/jazz16.c | 3 +--
sound/isa/sb/sb16.c | 3 +--
sound/isa/sb/sb8.c | 3 +--
sound/isa/sc6000.c | 3 +--
sound/isa/sscape.c | 3 +--
sound/isa/wavefront/wavefront.c | 3 +--
38 files changed, 44 insertions(+), 88 deletions(-)
Interdiff against v1:
diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c
index ad2ac16ff12d..c591c0851fa2 100644
--- a/drivers/media/radio/radio-isa.c
+++ b/drivers/media/radio/radio-isa.c
@@ -273,8 +273,8 @@ static int radio_isa_common_probe(struct radio_isa_card *isa,
return res;
}
-static int radio_isa_common_remove(struct radio_isa_card *isa,
- unsigned region_size)
+static void radio_isa_common_remove(struct radio_isa_card *isa,
+ unsigned region_size)
{
const struct radio_isa_ops *ops = isa->drv->ops;
@@ -285,7 +285,6 @@ static int radio_isa_common_remove(struct radio_isa_card *isa,
release_region(isa->io, region_size);
v4l2_info(&isa->v4l2_dev, "Removed radio card %s\n", isa->drv->card);
kfree(isa);
- return 0;
}
int radio_isa_probe(struct device *pdev, unsigned int dev)
@@ -338,11 +337,11 @@ int radio_isa_probe(struct device *pdev, unsigned int dev)
}
EXPORT_SYMBOL_GPL(radio_isa_probe);
-int radio_isa_remove(struct device *pdev, unsigned int dev)
+void radio_isa_remove(struct device *pdev, unsigned int dev)
{
struct radio_isa_card *isa = dev_get_drvdata(pdev);
- return radio_isa_common_remove(isa, isa->drv->region_size);
+ radio_isa_common_remove(isa, isa->drv->region_size);
}
EXPORT_SYMBOL_GPL(radio_isa_remove);
diff --git a/drivers/media/radio/radio-isa.h b/drivers/media/radio/radio-isa.h
index 2f0736edfda8..c9159958203e 100644
--- a/drivers/media/radio/radio-isa.h
+++ b/drivers/media/radio/radio-isa.h
@@ -91,7 +91,7 @@ struct radio_isa_driver {
int radio_isa_match(struct device *pdev, unsigned int dev);
int radio_isa_probe(struct device *pdev, unsigned int dev);
-int radio_isa_remove(struct device *pdev, unsigned int dev);
+void radio_isa_remove(struct device *pdev, unsigned int dev);
#ifdef CONFIG_PNP
int radio_isa_pnp_probe(struct pnp_dev *dev,
const struct pnp_device_id *dev_id);
base-commit: e609571b5ffa3528bf85292de1ceaddac342bc1c
--
2.29.2
next reply other threads:[~2021-01-22 12:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 9:24 Uwe Kleine-König [this message]
2021-01-22 9:24 ` [PATCH v2 1/3] watchdog: pcwd: drop always-false if from remove callback Uwe Kleine-König
2021-01-22 9:24 ` [PATCH v2 3/3] isa: Make the remove callback for isa drivers return void Uwe Kleine-König
2021-01-25 9:52 ` Hans Verkuil
2021-01-26 6:55 ` [PATCH v2 0/3] " Takashi Iwai
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=20210122092449.426097-1-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=alsa-devel@alsa-project.org \
--cc=davem@davemloft.net \
--cc=dmitry.torokhov@gmail.com \
--cc=fthain@telegraphics.com.au \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=hverkuil@xs4all.nl \
--cc=jejb@linux.ibm.com \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=martin.petersen@oracle.com \
--cc=mchehab@kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pof@eslack.org \
--cc=rafael@kernel.org \
--cc=schmitzmic@gmail.com \
--cc=tiwai@suse.com \
--cc=vilhelm.gray@gmail.com \
--cc=wg@grandegger.com \
--cc=willy@infradead.org \
--cc=wim@linux-watchdog.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).