Skip to contentSkip to conversation

Input: twl4030-vibra - Drop legacy, non DT boot support

PATCH Applied Peter Ujfalusi 2 participants 3 messages Jun 16, 2022 – Sep 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Input: twl4030-vibra - Drop legacy, non DT boot support

Legacy or non DT boot is no longer possible on systems where the tw4030/5030 is used.

Drop the support for handling legacy pdata.

---
 drivers/input/misc/twl4030-vibra.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/input/misc/twl4030-vibra.c +4 -9
index e0ff616fb857..5619996da86f 100644
@@ -163,14 +163,10 @@ static int __maybe_unused twl4030_vibra_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
 			 twl4030_vibra_suspend, twl4030_vibra_resume);
 
-static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata,
-			      struct device_node *parent)
+static bool twl4030_vibra_check_coexist(struct device_node *parent)
 {
 	struct device_node *node;
 
-	if (pdata && pdata->coexist)
-		return true;
-
 	node = of_get_child_by_name(parent, "codec");
 	if (node) {
 		of_node_put(node);
@@ -182,13 +178,12 @@ static bool twl4030_vibra_check_coexist(struct twl4030_vibra_data *pdata,
 
 static int twl4030_vibra_probe(struct platform_device *pdev)
 {
-	struct twl4030_vibra_data *pdata = dev_get_platdata(&pdev->dev);
 	struct device_node *twl4030_core_node = pdev->dev.parent->of_node;
 	struct vibra_info *info;
 	int ret;
 
-	if (!pdata && !twl4030_core_node) {
-		dev_dbg(&pdev->dev, "platform_data not available\n");
+	if (!twl4030_core_node) {
+		dev_dbg(&pdev->dev, "twl4030 OF node is missing\n");
 		return -EINVAL;
 	}
 
@@ -197,7 +192,7 @@ static int twl4030_vibra_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	info->dev = &pdev->dev;
-	info->coexist = twl4030_vibra_check_coexist(pdata, twl4030_core_node);
+	info->coexist = twl4030_vibra_check_coexist(twl4030_core_node);
 	INIT_WORK(&info->play_work, vibra_play_work);
 
 	info->input_dev = devm_input_allocate_device(&pdev->dev);
Signature · 1 line
2.36.1
maintainer Applied
#1 lore raw
Quoted 6 lines · Peter Ujfalusi

Legacy or non DT boot is no longer possible on systems where the tw4030/5030 is used.

Drop the support for handling legacy pdata.

Applied, thank you.

I suppose you will be dropping definition of struct twl4030_vibra_data from include/linux/mfd/twl.h as well?

Thanks.

Signature · 1 line
Dmitry
#2 lore raw
Quoted 4 lines · Dmitry Torokhov
Quoted 3 lines · Peter Ujfalusi

Legacy or non DT boot is no longer possible on systems where the tw4030/5030 is used.

Quoted 8 lines
Quoted 3 lines

Drop the support for handling legacy pdata.

Applied, thank you.

I suppose you will be dropping definition of struct twl4030_vibra_data from include/linux/mfd/twl.h as well?

Yes, that is the plan after all drivers have been cleaned up.

Signature · 1 line
Péter