github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull request contains a patch that shifts to using new simplified

Browse Source 
i2c driver probe method inside mach-davinci (i2c_driver->probe_new())
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEETzm5oVCjVpjkLDLaYUG7aOq+BE0FAl9yMGkACgkQYUG7aOq+
 BE1JyQ/+KWp9xc29295l37y/09s9l5z7QmUWxAgo6yVhTG6eeqBiUgnWBBxbTsXe
 UNhonQMTcSUv3622gmgKPzRNpr7YHm0fZbKZ/+7/onwIhN5sjbGq4UF5kXCODJRo
 V3zXOVSZ+KRsMZRn1Jpa6JBo3Fs3g0hoQLGFo6Egb/+GZHLkYENBfK78ja1AMSWB
 N4tORXS8haeuZyEUyvUm3azKD8/2pUqvP7HASwrKCoIBok9VSTTshd5lO9/Yhuid
 3cFTgfcwyn2TJ3BW1rhMtzAStJYcEOPf67ruki/ZE3S+lo8aGpjrC1AaJTougzfI
 /oV75zS/DxTOrWMddo2Cf2YveqxDDW3gwCEXRxCAm5v/ZNy1IZbF2cM8WWxZb/ur
 LeImCjAb1Kmc1L6qN1XQp2SNlfICdmTKOcgYCK9eS6OHo+mcIXZHZCbVhj3LMUa4
 Ad5NbjHR5xjT8mjfnNQxSPkwED+pvXC1ZLBkRxS/RDMuDMkFbSpP6zL8itSOJg+Y
 OVsgPrkEQnpJdxMoIVVIVsEMZhVfKKA04YAZc2/l/GkldapWuHBI1pt1SosNm7oR
 CB+S4Lq6YWoO2OQIREQOh6gC4oE7t5czB/h/iyr2aw3O5OUlNBSeFz8c/E6L3IT5
 aGmPJLJmeS+T3nq1G8SDPhruSxymsWNq86qdaZnAUa/qh1wuUXs=
 =Fged
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v5.10/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/soc

This pull request contains a patch that shifts to using new simplified
i2c driver probe method inside mach-davinci (i2c_driver->probe_new())

* tag 'davinci-for-v5.10/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: use simple i2c probe function

Link: https://lore.kernel.org/r/83eff002-5247-4fb6-33b4-ce7cec3d2d5c@ti.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-10-03 13:14:13 -07:00
commit 1d004afe5f
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-davinci/board-dm644x-evm.c
View File

@ -548,8 +548,7 @@ static const struct property_entry eeprom_properties[] = {
*/
static struct i2c_client *dm6446evm_msp;
static int dm6446evm_msp_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int dm6446evm_msp_probe(struct i2c_client *client)
{
dm6446evm_msp = client;
return 0;
@ -569,7 +568,7 @@ static const struct i2c_device_id dm6446evm_msp_ids[] = {
static struct i2c_driver dm6446evm_msp_driver = {
.driver.name = "dm6446evm_msp",
.id_table = dm6446evm_msp_ids,
.probe = dm6446evm_msp_probe,
.probe_new = dm6446evm_msp_probe,
.remove = dm6446evm_msp_remove,
};

10
arch/arm/mach-davinci/board-dm646x-evm.c
View File

@ -160,8 +160,7 @@ static struct platform_device davinci_aemif_device = {
#define DM646X_EVM_ATA_PWD BIT(1)
/* CPLD Register 0 Client: used for I/O Control */
static int cpld_reg0_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int cpld_reg0_probe(struct i2c_client *client)
{
if (HAS_ATA) {
u8 data;
@ -197,7 +196,7 @@ static const struct i2c_device_id cpld_reg_ids[] = {
static struct i2c_driver dm6467evm_cpld_driver = {
.driver.name = "cpld_reg0",
.id_table = cpld_reg_ids,
.probe = cpld_reg0_probe,
.probe_new = cpld_reg0_probe,
};
/* LEDS */
@ -397,8 +396,7 @@ static struct snd_platform_data dm646x_evm_snd_data[] = {
#ifdef CONFIG_I2C
static struct i2c_client *cpld_client;
static int cpld_video_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int cpld_video_probe(struct i2c_client *client)
{
cpld_client = client;
return 0;
@ -419,7 +417,7 @@ static struct i2c_driver cpld_video_driver = {
.driver = {
.name = "cpld_video",
},
.probe = cpld_video_probe,
.probe_new = cpld_video_probe,
.remove = cpld_video_remove,
.id_table = cpld_video_id,
};