mirror of
https://github.com/tbsdtv/media_build.git
synced 2025-07-23 04:13:02 +02:00
63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c
|
|
index 6be4e5528879..6f2a66bc87fb 100644
|
|
--- a/drivers/media/spi/cxd2880-spi.c
|
|
+++ b/drivers/media/spi/cxd2880-spi.c
|
|
@@ -625,7 +625,7 @@ cxd2880_spi_probe(struct spi_device *spi)
|
|
return ret;
|
|
}
|
|
|
|
-static void
|
|
+static int
|
|
cxd2880_spi_remove(struct spi_device *spi)
|
|
{
|
|
struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi);
|
|
@@ -643,6 +643,8 @@ cxd2880_spi_remove(struct spi_device *spi)
|
|
|
|
kfree(dvb_spi);
|
|
pr_info("cxd2880_spi remove ok.\n");
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static const struct spi_device_id cxd2880_spi_id[] = {
|
|
diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c
|
|
index 75c21a93e6d0..f86ef1ca1288 100644
|
|
--- a/drivers/media/spi/gs1662.c
|
|
+++ b/drivers/media/spi/gs1662.c
|
|
@@ -458,11 +458,13 @@ static int gs_probe(struct spi_device *spi)
|
|
return ret;
|
|
}
|
|
|
|
-static void gs_remove(struct spi_device *spi)
|
|
+static int gs_remove(struct spi_device *spi)
|
|
{
|
|
struct v4l2_subdev *sd = spi_get_drvdata(spi);
|
|
|
|
v4l2_device_unregister_subdev(sd);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static struct spi_driver gs_driver = {
|
|
diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c
|
|
index ad6c72c1ed04..44247049a319 100644
|
|
--- a/drivers/media/tuners/msi001.c
|
|
+++ b/drivers/media/tuners/msi001.c
|
|
@@ -472,7 +472,7 @@ static int msi001_probe(struct spi_device *spi)
|
|
return ret;
|
|
}
|
|
|
|
-static void msi001_remove(struct spi_device *spi)
|
|
+static int msi001_remove(struct spi_device *spi)
|
|
{
|
|
struct v4l2_subdev *sd = spi_get_drvdata(spi);
|
|
struct msi001_dev *dev = sd_to_msi001_dev(sd);
|
|
@@ -486,6 +486,7 @@ static void msi001_remove(struct spi_device *spi)
|
|
v4l2_device_unregister_subdev(&dev->sd);
|
|
v4l2_ctrl_handler_free(&dev->hdl);
|
|
kfree(dev);
|
|
+ return 0;
|
|
}
|
|
|
|
static const struct spi_device_id msi001_id_table[] = {
|