| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 22 Jan 2021 10:24:46 +0100
From: Uwe Kleine-König <uwe@...ine-koenig.org>
To: Wim Van Sebroeck <wim@...ux-watchdog.org>,
Guenter Roeck <linux@...ck-us.net>,
William Breathitt Gray <vilhelm.gray@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J. Wysocki" <rafael@...nel.org>,
Pau Oliva Fora <pof@...ack.org>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Wolfgang Grandegger <wg@...ndegger.com>,
Marc Kleine-Budde <mkl@...gutronix.de>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Matthew Wilcox <willy@...radead.org>,
Hannes Reinecke <hare@...e.com>,
"James E.J. Bottomley" <jejb@...ux.ibm.com>,
"Martin K. Petersen" <martin.petersen@...cle.com>,
Finn Thain <fthain@...egraphics.com.au>,
Michael Schmitz <schmitzmic@...il.com>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Hans Verkuil <hverkuil@...all.nl>
Cc: linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-i2c@...r.kernel.org, linux-input@...r.kernel.org,
linux-media@...r.kernel.org, linux-can@...r.kernel.org,
netdev@...r.kernel.org, linux-scsi@...r.kernel.org,
alsa-devel@...a-project.org
Subject: [PATCH v2 0/3] isa: Make the remove callback for isa drivers return void
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@...e.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
Powered by blists - more mailing lists