Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f758eb23 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: dw9714: Remove ACPI match tables, convert to use probe_new 



The ACPI match table is empty. Remove it.

Also convert the drive to use probe_new callback in struct i2c_driver.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent c2bc8b06

drivers/media/i2c/dw9714.c

+4 −15
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 * GNU General Public License for more details.

 */



#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/module.h>
@@ -147,8 +146,7 @@ static int dw9714_init_controls(struct dw9714_device *dev_vcm) 
	return hdl->error;

}



static int dw9714_probe(struct i2c_client *client,

			const struct i2c_device_id *devid)

static int dw9714_probe(struct i2c_client *client)

{

	struct dw9714_device *dw9714_dev;

	int rval;
@@ -250,18 +248,10 @@ static int __maybe_unused dw9714_vcm_resume(struct device *dev) 
	return 0;

}



#ifdef CONFIG_ACPI

static const struct acpi_device_id dw9714_acpi_match[] = {

	{},

};

MODULE_DEVICE_TABLE(acpi, dw9714_acpi_match);

#endif



static const struct i2c_device_id dw9714_id_table[] = {

	{ DW9714_NAME, 0 },

	{}

	{ { 0 } }

};



MODULE_DEVICE_TABLE(i2c, dw9714_id_table);



static const struct of_device_id dw9714_of_table[] = {
@@ -279,10 +269,9 @@ static struct i2c_driver dw9714_i2c_driver = { 
	.driver = {

		.name = DW9714_NAME,

		.pm = &dw9714_pm_ops,

		.acpi_match_table = ACPI_PTR(dw9714_acpi_match),

		.of_match_table = dw9714_of_table,

	},

	.probe = dw9714_probe,

	.probe_new = dw9714_probe,

	.remove = dw9714_remove,

	.id_table = dw9714_id_table,

};