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

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

[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.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
---
 drivers/input/misc/twl4030-vibra.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index e0ff616fb857..5619996da86f 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -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);
-- 
2.36.1

Re: [PATCH] Input: twl4030-vibra - Drop legacy, non DT boot support

[Dmitry Torokhov]

On Thu, Jun 16, 2022 at 06:33:23PM +0300, Peter Ujfalusi wrote:
> Legacy or non DT boot is no longer possible on systems where the
> tw4030/5030 is used.
> 
> Drop the support for handling legacy pdata.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>

Applied, thank you.

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

Thanks.

-- 
Dmitry

Re: [PATCH] Input: twl4030-vibra - Drop legacy, non DT boot support

[Péter Ujfalusi]

On 9/25/22 08:37, Dmitry Torokhov wrote:
> On Thu, Jun 16, 2022 at 06:33:23PM +0300, Peter Ujfalusi wrote:
>> Legacy or non DT boot is no longer possible on systems where the
>> tw4030/5030 is used.
>>
>> Drop the support for handling legacy pdata.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
> 
> 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.

-- 
Péter