Skip to contentSkip to conversation

media: i2c: s5c73m3: remove support for platform data

PATCH New Dmitry Torokhov 1 participant 1 message Nov 28, 2022

Subsystems (2)
Media (V4L/DVB) Samsung S5C73M3 camera driver
lore
Share & tools
lore

Dmitry Torokhov

author
#0 lore raw

PATCH v2 1/1 media: i2c: s5c73m3: remove support for platform data

There are no existing users of s5c73m3_platform_data in the tree, and new users should either be using device tree, ACPI, or static device properties, so let's remove it from the driver.

Reviewed-by Linus Walleij <[email protected]>
Signed-off-by Dmitry Torokhov <[email protected]>

---

v2: rebased on top of Linus' patch converting the driver to GPIOD API
as requested by Hans
https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/

 drivers/media/i2c/s5c73m3/s5c73m3-core.c  | 20 +++--------
 drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c |  1 -
 drivers/media/i2c/s5c73m3/s5c73m3.h       |  1 -
 include/media/i2c/s5c73m3.h               | 41 -----------------------
 4 files changed, 5 insertions(+), 58 deletions(-)
drivers/media/i2c/s5c73m3/s5c73m3-core.c +5 -15
index 59b03b0860d5..318a4ec2d8a5 100644
@@ -26,7 +26,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-mediabus.h>
-#include <media/i2c/s5c73m3.h>
 #include <media/v4l2-fwnode.h>
 
 #include "s5c73m3.h"

@@ -1522,25 +1521,16 @@ static const struct v4l2_subdev_ops oif_subdev_ops = {
 	.video	= &s5c73m3_oif_video_ops,
 };
 
-static int s5c73m3_get_platform_data(struct s5c73m3 *state)
+static int s5c73m3_get_dt_data(struct s5c73m3 *state)
 {
-	struct i2c_client *c = state->i2c_client;
-	struct device *dev = &c->dev;
-	const struct s5c73m3_platform_data *pdata = dev->platform_data;
+	struct device *dev = &state->i2c_client->dev;
 	struct device_node *node = dev->of_node;
 	struct device_node *node_ep;
 	struct v4l2_fwnode_endpoint ep = { .bus_type = 0 };
 	int ret;
 
-	if (!node) {
-		if (!pdata) {
-			dev_err(dev, "Platform data not specified\n");
-			return -EINVAL;
-		}
-
-		state->mclk_frequency = pdata->mclk_frequency;
-		return 0;
-	}
+	if (!node)
+		return -EINVAL;
 
 	state->clock = devm_clk_get(dev, S5C73M3_CLK_NAME);
 	if (IS_ERR(state->clock))

@@ -1603,7 +1593,7 @@ static int s5c73m3_probe(struct i2c_client *client)
 		return -ENOMEM;
 
 	state->i2c_client = client;
-	ret = s5c73m3_get_platform_data(state);
+	ret = s5c73m3_get_dt_data(state);
 	if (ret < 0)
 		return ret;
drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c +0 -1
index e3543ae384ed..1c8103670fa2 100644
@@ -23,7 +23,6 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-mediabus.h>
-#include <media/i2c/s5c73m3.h>
 
 #include "s5c73m3.h"
drivers/media/i2c/s5c73m3/s5c73m3.h +0 -1
index 1fc7df41c5ee..627e80cf5b72 100644
@@ -16,7 +16,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-subdev.h>
-#include <media/i2c/s5c73m3.h>
 
 #define DRIVER_NAME			"S5C73M3"
include/media/i2c/s5c73m3.h deleted +0 -41

41 lines not on this page · raw message

Signature · 5 lines
2.38.1.584.g0f3c55d4c2-goog


-- 
Dmitry