[594/606] video: fbdev: matrox: Convert to i2c's .probe_new()

Message ID 20221118224540.619276-595-uwe@kleine-koenig.org
State New
Headers
Series i2c: Complete conversion to i2c_probe_new |

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:45 p.m. UTC
  From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

The probe function doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/video/fbdev/matrox/matroxfb_maven.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
  

Comments

Helge Deller Nov. 19, 2022, 6:39 a.m. UTC | #1
On 11/18/22 23:45, Uwe Kleine-König wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>
> The probe function doesn't make use of the i2c_device_id * parameter so it
> can be trivially converted.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

applied.

Thanks!
Helge


> ---
>   drivers/video/fbdev/matrox/matroxfb_maven.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c
> index f2e02958673d..727a10a59811 100644
> --- a/drivers/video/fbdev/matrox/matroxfb_maven.c
> +++ b/drivers/video/fbdev/matrox/matroxfb_maven.c
> @@ -1249,8 +1249,7 @@ static int maven_shutdown_client(struct i2c_client* clnt) {
>   	return 0;
>   }
>
> -static int maven_probe(struct i2c_client *client,
> -		       const struct i2c_device_id *id)
> +static int maven_probe(struct i2c_client *client)
>   {
>   	struct i2c_adapter *adapter = client->adapter;
>   	int err = -ENODEV;
> @@ -1292,7 +1291,7 @@ static struct i2c_driver maven_driver={
>   	.driver = {
>   		.name	= "maven",
>   	},
> -	.probe		= maven_probe,
> +	.probe_new	= maven_probe,
>   	.remove		= maven_remove,
>   	.id_table	= maven_id,
>   };
  

Patch

diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c
index f2e02958673d..727a10a59811 100644
--- a/drivers/video/fbdev/matrox/matroxfb_maven.c
+++ b/drivers/video/fbdev/matrox/matroxfb_maven.c
@@ -1249,8 +1249,7 @@  static int maven_shutdown_client(struct i2c_client* clnt) {
 	return 0;
 }
 
-static int maven_probe(struct i2c_client *client,
-		       const struct i2c_device_id *id)
+static int maven_probe(struct i2c_client *client)
 {
 	struct i2c_adapter *adapter = client->adapter;
 	int err = -ENODEV;
@@ -1292,7 +1291,7 @@  static struct i2c_driver maven_driver={
 	.driver = {
 		.name	= "maven",
 	},
-	.probe		= maven_probe,
+	.probe_new	= maven_probe,
 	.remove		= maven_remove,
 	.id_table	= maven_id,
 };