diff mbox series

[v1,2/2] i2c: designware: Get rid of legacy platform data

Message ID 20210331154851.8456-3-andriy.shevchenko@linux.intel.com
State Awaiting Upstream
Headers show
Series [v1,1/2] mfd: intel_quark_i2c_gpio: Convert I²C to use software nodes | expand

Commit Message

Andy Shevchenko March 31, 2021, 3:48 p.m. UTC
Platform data is a legacy interface to supply device properties
to the driver. In this case we don't have anymore in-kernel users
for it. Just remove it for good.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/i2c/busses/i2c-designware-platdrv.c  |  7 +------
 include/linux/platform_data/i2c-designware.h | 13 -------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 include/linux/platform_data/i2c-designware.h

Comments

Wolfram Sang April 6, 2021, 10:49 a.m. UTC | #1
On Wed, Mar 31, 2021 at 06:48:51PM +0300, Andy Shevchenko wrote:
> Platform data is a legacy interface to supply device properties
> to the driver. In this case we don't have anymore in-kernel users
> for it. Just remove it for good.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Acked-by: Wolfram Sang <wsa@kernel.org>
Jarkko Nikula April 6, 2021, 11:27 a.m. UTC | #2
On 4/6/21 1:49 PM, Wolfram Sang wrote:
> On Wed, Mar 31, 2021 at 06:48:51PM +0300, Andy Shevchenko wrote:
>> Platform data is a legacy interface to supply device properties
>> to the driver. In this case we don't have anymore in-kernel users
>> for it. Just remove it for good.
>>
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Acked-by: Wolfram Sang <wsa@kernel.org>
> 
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Lee Jones April 14, 2021, 8:14 a.m. UTC | #3
On Tue, 06 Apr 2021, Wolfram Sang wrote:

> On Wed, Mar 31, 2021 at 06:48:51PM +0300, Andy Shevchenko wrote:
> > Platform data is a legacy interface to supply device properties
> > to the driver. In this case we don't have anymore in-kernel users
> > for it. Just remove it for good.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Acked-by: Wolfram Sang <wsa@kernel.org>

Do you require an immutable branch?
Wolfram Sang April 14, 2021, 8:15 a.m. UTC | #4
> > > Platform data is a legacy interface to supply device properties
> > > to the driver. In this case we don't have anymore in-kernel users
> > > for it. Just remove it for good.
> > > 
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > 
> > Acked-by: Wolfram Sang <wsa@kernel.org>
> 
> Do you require an immutable branch?

Nope, but thanks for asking.
Lee Jones April 14, 2021, 8:33 a.m. UTC | #5
On Wed, 31 Mar 2021, Andy Shevchenko wrote:

> Platform data is a legacy interface to supply device properties
> to the driver. In this case we don't have anymore in-kernel users
> for it. Just remove it for good.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/i2c/busses/i2c-designware-platdrv.c  |  7 +------
>  include/linux/platform_data/i2c-designware.h | 13 -------------
>  2 files changed, 1 insertion(+), 19 deletions(-)
>  delete mode 100644 include/linux/platform_data/i2c-designware.h

Applied, thanks.
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 0dfeb2d11603..4b37f28ec0c6 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -22,7 +22,6 @@ 
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/platform_data/i2c-designware.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
@@ -206,7 +205,6 @@  static const struct dmi_system_id dw_i2c_hwmon_class_dmi[] = {
 
 static int dw_i2c_plat_probe(struct platform_device *pdev)
 {
-	struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	struct i2c_adapter *adap;
 	struct dw_i2c_dev *dev;
 	struct i2c_timings *t;
@@ -236,10 +234,7 @@  static int dw_i2c_plat_probe(struct platform_device *pdev)
 	reset_control_deassert(dev->rst);
 
 	t = &dev->timings;
-	if (pdata)
-		t->bus_freq_hz = pdata->i2c_scl_freq;
-	else
-		i2c_parse_fw_timings(&pdev->dev, t, false);
+	i2c_parse_fw_timings(&pdev->dev, t, false);
 
 	i2c_dw_adjust_bus_speed(dev);
 
diff --git a/include/linux/platform_data/i2c-designware.h b/include/linux/platform_data/i2c-designware.h
deleted file mode 100644
index 014c4a5a7e13..000000000000
--- a/include/linux/platform_data/i2c-designware.h
+++ /dev/null
@@ -1,13 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright(c) 2014 Intel Corporation.
- */
-
-#ifndef I2C_DESIGNWARE_H
-#define I2C_DESIGNWARE_H
-
-struct dw_i2c_platform_data {
-	unsigned int i2c_scl_freq;
-};
-
-#endif