i2c: use inclusive callbacks in struct i2c_algorithm

Convert the I2C subsystem to drop using the 'master_'-prefixed callbacks
in favor of the simplified ones. Fix alignment of '=' while here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index eddf25b90ca8d66f01eb21a047e00700d660fa64..6544d27e44190a5772caf2d32a1b9f792bdfb5bc 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -619,8 +619,8 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: ------------------------------------- */
 
 const struct i2c_algorithm i2c_bit_algo = {
-       .master_xfer = bit_xfer,
-       .master_xfer_atomic = bit_xfer_atomic,
+       .xfer = bit_xfer,
+       .xfer_atomic = bit_xfer_atomic,
        .functionality = bit_func,
 };
 EXPORT_SYMBOL(i2c_bit_algo);

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 384af88e58adaeb99cce13cb7f21cef812607280..74b66aec33d4c4dbd3f5795a9e6fbf45ebd6811d 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -361,8 +361,8 @@ static u32 pca_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm pca_algo = {
-       .master_xfer    = pca_xfer,
-       .functionality  = pca_func,
+       .xfer = pca_xfer,
+       .functionality = pca_func,
 };
 
 static unsigned int pca_probe_chip(struct i2c_adapter *adap)

diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 740066ceaea37598e60090d471af4d148e68bd1d..fd563e845d4b70493df0ab561db84dec9b54e00f 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -389,8 +389,8 @@ static u32 pcf_func(struct i2c_adapter *adap)
 
 /* exported algorithm data: */
 static const struct i2c_algorithm pcf_algo = {
-       .master_xfer    = pcf_xfer,
-       .functionality  = pcf_func,
+       .xfer = pcf_xfer,
+       .functionality = pcf_func,
 };
 
 /*

diff --git a/drivers/i2c/busses/i2c-amd-mp2-plat.c b/drivers/i2c/busses/i2c-amd-mp2-plat.c
index d9dd0e475d1a3811fbc87c341049d1f68d2cbe55..188e24cc4d35f14a97161500c7bb0bc7a465dbac 100644 (file)
--- a/drivers/i2c/busses/i2c-amd-mp2-plat.c
+++ b/drivers/i2c/busses/i2c-amd-mp2-plat.c
@@ -179,7 +179,7 @@ static u32 i2c_amd_func(struct i2c_adapter *a)
 }
 
 static const struct i2c_algorithm i2c_amd_algorithm = {
-       .master_xfer = i2c_amd_xfer,
+       .xfer = i2c_amd_xfer,
        .functionality = i2c_amd_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
index 1550d3d552aed450c0b320d3fe7368af83df11e3..a26b74c712061188bf761b28247f5cef44b67515 100644 (file)
--- a/drivers/i2c/busses/i2c-aspeed.c
+++ b/drivers/i2c/busses/i2c-aspeed.c
@@ -814,11 +814,11 @@ static int aspeed_i2c_unreg_slave(struct i2c_client *client)
 #endif /* CONFIG_I2C_SLAVE */
 
 static const struct i2c_algorithm aspeed_i2c_algo = {
-       .master_xfer    = aspeed_i2c_master_xfer,
-       .functionality  = aspeed_i2c_functionality,
+       .xfer = aspeed_i2c_master_xfer,
+       .functionality = aspeed_i2c_functionality,
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
-       .reg_slave      = aspeed_i2c_reg_slave,
-       .unreg_slave    = aspeed_i2c_unreg_slave,
+       .reg_slave = aspeed_i2c_reg_slave,
+       .unreg_slave = aspeed_i2c_unreg_slave,
 #endif /* CONFIG_I2C_SLAVE */
 };
 

diff --git a/drivers/i2c/busses/i2c-at91-master.c b/drivers/i2c/busses/i2c-at91-master.c
index 374fc50bb205fb1b9baa9c052faacd281413bcdf..59795c1c24ffde60cdfd3dd31ded9b096fc568b4 100644 (file)
--- a/drivers/i2c/busses/i2c-at91-master.c
+++ b/drivers/i2c/busses/i2c-at91-master.c
@@ -739,8 +739,8 @@ static u32 at91_twi_func(struct i2c_adapter *adapter)
 }
 
 static const struct i2c_algorithm at91_twi_algorithm = {
-       .master_xfer    = at91_twi_xfer,
-       .functionality  = at91_twi_func,
+       .xfer = at91_twi_xfer,
+       .functionality = at91_twi_func,
 };
 
 static int at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr)

diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index 50030256cd8573e5cb811029b0746a87570e6399..0555eeb6903a1fe769096b9233f46e834155b788 100644 (file)
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -706,7 +706,7 @@ static int axxia_i2c_unreg_slave(struct i2c_client *slave)
 }
 
 static const struct i2c_algorithm axxia_i2c_algo = {
-       .master_xfer = axxia_i2c_xfer,
+       .xfer = axxia_i2c_xfer,
        .functionality = axxia_i2c_func,
        .reg_slave = axxia_i2c_reg_slave,
        .unreg_slave = axxia_i2c_unreg_slave,

diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
index 63bc3c8f49d3d28f3ec2b767b2df9e53d40ba714..e418a4f23f156feef294a62b542ec2043d571324 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -1041,7 +1041,7 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave)
 }
 
 static struct i2c_algorithm bcm_iproc_algo = {
-       .master_xfer = bcm_iproc_i2c_xfer,
+       .xfer = bcm_iproc_i2c_xfer,
        .functionality = bcm_iproc_i2c_functionality,
        .reg_slave = bcm_iproc_i2c_reg_slave,
        .unreg_slave = bcm_iproc_i2c_unreg_slave,

diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index 8df63aaf2a8006285b2ba02e721b14ff91f07148..697d095afbe498d96d61a94883c7a9c8690a8c4c 100644 (file)
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -1231,12 +1231,12 @@ static int cdns_unreg_slave(struct i2c_client *slave)
 #endif
 
 static const struct i2c_algorithm cdns_i2c_algo = {
-       .master_xfer    = cdns_i2c_master_xfer,
-       .master_xfer_atomic = cdns_i2c_master_xfer_atomic,
-       .functionality  = cdns_i2c_func,
+       .xfer = cdns_i2c_master_xfer,
+       .xfer_atomic = cdns_i2c_master_xfer_atomic,
+       .functionality = cdns_i2c_func,
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
-       .reg_slave      = cdns_reg_slave,
-       .unreg_slave    = cdns_unreg_slave,
+       .reg_slave = cdns_reg_slave,
+       .unreg_slave = cdns_unreg_slave,
 #endif
 };
 

diff --git a/drivers/i2c/busses/i2c-cgbc.c b/drivers/i2c/busses/i2c-cgbc.c
index f054d167ac47600fda88434967499ba7158474b2..25a74fa51aa00263b06379c1444487b16d1a705d 100644 (file)
--- a/drivers/i2c/busses/i2c-cgbc.c
+++ b/drivers/i2c/busses/i2c-cgbc.c
@@ -331,8 +331,8 @@ static u32 cgbc_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm cgbc_i2c_algorithm = {
-       .master_xfer    = cgbc_i2c_xfer,
-       .functionality  = cgbc_i2c_func,
+       .xfer = cgbc_i2c_xfer,
+       .functionality = cgbc_i2c_func,
 };
 
 static struct i2c_algo_cgbc_data cgbc_i2c_algo_data[] = {

diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index efdaddf99f9ec325784f7009ab651164c9066b57..27ea3c130a160e58fa0a4355dc9209d024bb857a 100644 (file)
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -690,7 +690,7 @@ static u32 pch_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm pch_algorithm = {
-       .master_xfer = pch_i2c_xfer,
+       .xfer = pch_i2c_xfer,
        .functionality = pch_i2c_func
 };
 

diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c
index 2512cef8e2a2923cdff0c635c8df0dc3a1b550de..ece019b3d066e51021f02171d974d8b153d3592d 100644 (file)
--- a/drivers/i2c/busses/i2c-emev2.c
+++ b/drivers/i2c/busses/i2c-emev2.c
@@ -351,10 +351,10 @@ static int em_i2c_unreg_slave(struct i2c_client *slave)
 }
 
 static const struct i2c_algorithm em_i2c_algo = {
-       .master_xfer = em_i2c_xfer,
+       .xfer = em_i2c_xfer,
        .functionality = em_i2c_func,
-       .reg_slave      = em_i2c_reg_slave,
-       .unreg_slave    = em_i2c_unreg_slave,
+       .reg_slave = em_i2c_reg_slave,
+       .unreg_slave = em_i2c_unreg_slave,
 };
 
 static int em_i2c_probe(struct platform_device *pdev)

diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index 02f24479aa074d61beb447797b26eb9652f8170c..9c1c5f3c09f6df2fddd123d83fd1a28208a8f12d 100644 (file)
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -879,9 +879,9 @@ static u32 exynos5_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm exynos5_i2c_algorithm = {
-       .master_xfer            = exynos5_i2c_xfer,
-       .master_xfer_atomic     = exynos5_i2c_xfer_atomic,
-       .functionality          = exynos5_i2c_func,
+       .xfer = exynos5_i2c_xfer,
+       .xfer_atomic = exynos5_i2c_xfer_atomic,
+       .functionality = exynos5_i2c_func,
 };
 
 static int exynos5_i2c_probe(struct platform_device *pdev)

diff --git a/drivers/i2c/busses/i2c-gxp.c b/drivers/i2c/busses/i2c-gxp.c
index 0fc39caa6c871e5fe5e86b25661ab857fe99d77d..2d117e7e3cb6d4b71413e0183e6c77b44f761264 100644 (file)
--- a/drivers/i2c/busses/i2c-gxp.c
+++ b/drivers/i2c/busses/i2c-gxp.c
@@ -184,11 +184,11 @@ static int gxp_i2c_unreg_slave(struct i2c_client *slave)
 #endif
 
 static const struct i2c_algorithm gxp_i2c_algo = {
-       .master_xfer   = gxp_i2c_master_xfer,
+       .xfer = gxp_i2c_master_xfer,
        .functionality = gxp_i2c_func,
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
-       .reg_slave     = gxp_i2c_reg_slave,
-       .unreg_slave   = gxp_i2c_unreg_slave,
+       .reg_slave = gxp_i2c_reg_slave,
+       .unreg_slave = gxp_i2c_unreg_slave,
 #endif
 };
 

diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c
index 3278707bb8856ccc5b85391d9b315b3fe0a3fcef..a454f9f251461038405ff931b494a191a7501746 100644 (file)
--- a/drivers/i2c/busses/i2c-img-scb.c
+++ b/drivers/i2c/busses/i2c-img-scb.c
@@ -1143,7 +1143,7 @@ static u32 img_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm img_i2c_algo = {
-       .master_xfer = img_i2c_xfer,
+       .xfer = img_i2c_xfer,
        .functionality = img_i2c_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c
index 342d47e675869d225bcc84812e804d60e2f83de7..064bc83840a6256b31d21a629b4ce20219cd5988 100644 (file)
--- a/drivers/i2c/busses/i2c-imx-lpi2c.c
+++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -1268,10 +1268,10 @@ static u32 lpi2c_imx_func(struct i2c_adapter *adapter)
 }
 
 static const struct i2c_algorithm lpi2c_imx_algo = {
-       .master_xfer    = lpi2c_imx_xfer,
-       .functionality  = lpi2c_imx_func,
-       .reg_target     = lpi2c_imx_register_target,
-       .unreg_target   = lpi2c_imx_unregister_target,
+       .xfer = lpi2c_imx_xfer,
+       .functionality = lpi2c_imx_func,
+       .reg_target = lpi2c_imx_register_target,
+       .unreg_target = lpi2c_imx_unregister_target,
 };
 
 static const struct of_device_id lpi2c_imx_of_match[] = {

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index de01dfecb16e6692ef4d4b32273ece07f98b34ee..e5732b0557fb6f64965592b19e4ecd065e962521 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1692,11 +1692,11 @@ static u32 i2c_imx_func(struct i2c_adapter *adapter)
 }
 
 static const struct i2c_algorithm i2c_imx_algo = {
-       .master_xfer = i2c_imx_xfer,
-       .master_xfer_atomic = i2c_imx_xfer_atomic,
+       .xfer = i2c_imx_xfer,
+       .xfer_atomic = i2c_imx_xfer_atomic,
        .functionality = i2c_imx_func,
-       .reg_slave      = i2c_imx_reg_slave,
-       .unreg_slave    = i2c_imx_unreg_slave,
+       .reg_slave = i2c_imx_reg_slave,
+       .unreg_slave = i2c_imx_unreg_slave,
 };
 
 static int i2c_imx_probe(struct platform_device *pdev)

diff --git a/drivers/i2c/busses/i2c-keba.c b/drivers/i2c/busses/i2c-keba.c
index 7b9ed2592f5bc6ff28f1013b6952048167c67586..9420c8b342b573da435eeef5a05efde35d61434d 100644 (file)
--- a/drivers/i2c/busses/i2c-keba.c
+++ b/drivers/i2c/busses/i2c-keba.c
@@ -500,7 +500,7 @@ static u32 ki2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm ki2c_algo = {
-       .master_xfer   = ki2c_xfer,
+       .xfer = ki2c_xfer,
        .functionality = ki2c_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-mchp-pci1xxxx.c b/drivers/i2c/busses/i2c-mchp-pci1xxxx.c
index 5ef136c3ecb1262144f36be9e54336740d9e5528..bc0f1a0c8ee13b5850c97fea8ae97180e63471b1 100644 (file)
--- a/drivers/i2c/busses/i2c-mchp-pci1xxxx.c
+++ b/drivers/i2c/busses/i2c-mchp-pci1xxxx.c
@@ -1048,7 +1048,7 @@ static u32 pci1xxxx_i2c_get_funcs(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm pci1xxxx_i2c_algo = {
-       .master_xfer = pci1xxxx_i2c_xfer,
+       .xfer = pci1xxxx_i2c_xfer,
        .functionality = pci1xxxx_i2c_get_funcs,
 };
 

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index e1d69537353bf6ca8551786922817f4f03fd6a8c..0d9032953e48dae6333404b842c35c3299cde338 100644 (file)
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -448,8 +448,8 @@ static u32 meson_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm meson_i2c_algorithm = {
-       .master_xfer = meson_i2c_xfer,
-       .master_xfer_atomic = meson_i2c_xfer_atomic,
+       .xfer = meson_i2c_xfer,
+       .xfer_atomic = meson_i2c_xfer_atomic,
        .functionality = meson_i2c_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-microchip-corei2c.c b/drivers/i2c/busses/i2c-microchip-corei2c.c
index 492bf4c34722c287c1fc75a6021cb100d7de7dcb..f173bda1c98c6a0cd9aedb89e4202f4bdf5e055a 100644 (file)
--- a/drivers/i2c/busses/i2c-microchip-corei2c.c
+++ b/drivers/i2c/busses/i2c-microchip-corei2c.c
@@ -526,7 +526,7 @@ static int mchp_corei2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned
 }
 
 static const struct i2c_algorithm mchp_corei2c_algo = {
-       .master_xfer = mchp_corei2c_xfer,
+       .xfer = mchp_corei2c_xfer,
        .functionality = mchp_corei2c_func,
        .smbus_xfer = mchp_corei2c_smbus_xfer,
 };

diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 5bd342047d599e15f65bcd82669d174414cafd96..ab456c3717db18eef74226de0ee88c49228796f5 100644 (file)
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -1342,7 +1342,7 @@ static u32 mtk_i2c_functionality(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm mtk_i2c_algorithm = {
-       .master_xfer = mtk_i2c_transfer,
+       .xfer = mtk_i2c_transfer,
        .functionality = mtk_i2c_functionality,
 };
 

diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index ad62d56b2186e08595e1de0b867e80f7ad7cb5ac..08c9091a1e35151bac8d4adb80abdbd29a62b95a 100644 (file)
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -687,7 +687,7 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id)
 }
 
 static const struct i2c_algorithm mxs_i2c_algo = {
-       .master_xfer = mxs_i2c_xfer,
+       .xfer = mxs_i2c_xfer,
        .functionality = mxs_i2c_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index d2877e4cc28d42c97f07856eb5073bb5c2545368..19b648fc094d9748a0cce4e35f350da35ee25505 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -996,8 +996,8 @@ static unsigned int nmk_i2c_functionality(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm nmk_i2c_algo = {
-       .master_xfer    = nmk_i2c_xfer,
-       .functionality  = nmk_i2c_functionality
+       .xfer = nmk_i2c_xfer,
+       .functionality = nmk_i2c_functionality
 };
 
 static void nmk_i2c_of_probe(struct device_node *np,

diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
index 892e2d2988a7255b0a03bbb453ae67a05849209e..8b7e15240fb0bc8ec6c76dc9ad4489f0f30f5153 100644 (file)
--- a/drivers/i2c/busses/i2c-npcm7xx.c
+++ b/drivers/i2c/busses/i2c-npcm7xx.c
@@ -2470,11 +2470,11 @@ static const struct i2c_adapter_quirks npcm_i2c_quirks = {
 };
 
 static const struct i2c_algorithm npcm_i2c_algo = {
-       .master_xfer = npcm_i2c_master_xfer,
+       .xfer = npcm_i2c_master_xfer,
        .functionality = npcm_i2c_functionality,
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
-       .reg_slave      = npcm_i2c_reg_slave,
-       .unreg_slave    = npcm_i2c_unreg_slave,
+       .reg_slave = npcm_i2c_reg_slave,
+       .unreg_slave = npcm_i2c_unreg_slave,
 #endif
 };
 

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 876791d20ed55e8e5a50c6ed785b6db733b5689c..f1cc26ac5b805bc5a5621931632d912dab9417d4 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1201,9 +1201,9 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
 }
 
 static const struct i2c_algorithm omap_i2c_algo = {
-       .master_xfer    = omap_i2c_xfer_irq,
-       .master_xfer_atomic     = omap_i2c_xfer_polling,
-       .functionality  = omap_i2c_func,
+       .xfer = omap_i2c_xfer_irq,
+       .xfer_atomic = omap_i2c_xfer_polling,
+       .functionality = omap_i2c_func,
 };
 
 static const struct i2c_adapter_quirks omap_i2c_quirks = {

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 9a1af5bbd604cdd073c8df0b4d8e303d6e07bf05..8daa0008bd052680fe45ec61481cfbb8b1b12aa5 100644 (file)
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -580,7 +580,7 @@ static u32 i2c_pnx_func(struct i2c_adapter *adapter)
 }
 
 static const struct i2c_algorithm pnx_algorithm = {
-       .master_xfer = i2c_pnx_xfer,
+       .xfer = i2c_pnx_xfer,
        .functionality = i2c_pnx_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 4415a29f749b927ce96e54cfbd229e1f48fa8623..968a8b8794dac3398a68d827c567aa5bb73ae3d7 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1154,11 +1154,11 @@ static u32 i2c_pxa_functionality(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm i2c_pxa_algorithm = {
-       .master_xfer    = i2c_pxa_xfer,
-       .functionality  = i2c_pxa_functionality,
+       .xfer = i2c_pxa_xfer,
+       .functionality = i2c_pxa_functionality,
 #ifdef CONFIG_I2C_PXA_SLAVE
-       .reg_slave      = i2c_pxa_slave_reg,
-       .unreg_slave    = i2c_pxa_slave_unreg,
+       .reg_slave = i2c_pxa_slave_reg,
+       .unreg_slave = i2c_pxa_slave_unreg,
 #endif
 };
 
@@ -1244,11 +1244,11 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
 }
 
 static const struct i2c_algorithm i2c_pxa_pio_algorithm = {
-       .master_xfer    = i2c_pxa_pio_xfer,
-       .functionality  = i2c_pxa_functionality,
+       .xfer = i2c_pxa_pio_xfer,
+       .functionality = i2c_pxa_functionality,
 #ifdef CONFIG_I2C_PXA_SLAVE
-       .reg_slave      = i2c_pxa_slave_reg,
-       .unreg_slave    = i2c_pxa_slave_unreg,
+       .reg_slave = i2c_pxa_slave_reg,
+       .unreg_slave = i2c_pxa_slave_unreg,
 #endif
 };
 

diff --git a/drivers/i2c/busses/i2c-qcom-cci.c b/drivers/i2c/busses/i2c-qcom-cci.c
index 05b73326afd4a6652838e793c0743ff2261e3ef2..a3afa11a71a10dbb720ee9acb566991fe55b98a0 100644 (file)
--- a/drivers/i2c/busses/i2c-qcom-cci.c
+++ b/drivers/i2c/busses/i2c-qcom-cci.c
@@ -462,8 +462,8 @@ static u32 cci_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm cci_algo = {
-       .master_xfer    = cci_xfer,
-       .functionality  = cci_func,
+       .xfer = cci_xfer,
+       .functionality = cci_func,
 };
 
 static int cci_enable_clocks(struct cci *cci)

diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
index ccea575fb7838db864ca4a2b21ebb3835b2567b2..13889f52b6f78a767c0fd96d6a6d6ba2c6664205 100644 (file)
--- a/drivers/i2c/busses/i2c-qcom-geni.c
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -727,8 +727,8 @@ static u32 geni_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm geni_i2c_algo = {
-       .master_xfer    = geni_i2c_xfer,
-       .functionality  = geni_i2c_func,
+       .xfer = geni_i2c_xfer,
+       .functionality = geni_i2c_func,
 };
 
 #ifdef CONFIG_ACPI

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index 3a36d682ed5726d7a956180ea2072dc46d2f37d6..6059f585843ebc4db9c2ea4dc3053b14541a59b8 100644 (file)
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1634,13 +1634,13 @@ static u32 qup_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm qup_i2c_algo = {
-       .master_xfer    = qup_i2c_xfer,
-       .functionality  = qup_i2c_func,
+       .xfer = qup_i2c_xfer,
+       .functionality = qup_i2c_func,
 };
 
 static const struct i2c_algorithm qup_i2c_algo_v2 = {
-       .master_xfer    = qup_i2c_xfer_v2,
-       .functionality  = qup_i2c_func,
+       .xfer = qup_i2c_xfer_v2,
+       .functionality = qup_i2c_func,
 };
 
 /*

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 5693a38da7b5af259465396e087a011a1ff4a1f0..d51884ab99f4ddb3a6db0b3bbeb2f565ccd2711f 100644 (file)
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -1084,11 +1084,11 @@ static u32 rcar_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm rcar_i2c_algo = {
-       .master_xfer    = rcar_i2c_master_xfer,
-       .master_xfer_atomic = rcar_i2c_master_xfer_atomic,
-       .functionality  = rcar_i2c_func,
-       .reg_slave      = rcar_reg_slave,
-       .unreg_slave    = rcar_unreg_slave,
+       .xfer = rcar_i2c_master_xfer,
+       .xfer_atomic = rcar_i2c_master_xfer_atomic,
+       .functionality = rcar_i2c_func,
+       .reg_slave = rcar_reg_slave,
+       .unreg_slave = rcar_unreg_slave,
 };
 
 static const struct i2c_adapter_quirks rcar_i2c_quirks = {

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 0f3cf500df6823a3115e0ee3bff2a19aca72ab39..f4fa4703acbd0efb88178c377dd0d1459fedff3a 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -800,9 +800,9 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap)
 
 /* i2c bus registration info */
 static const struct i2c_algorithm s3c24xx_i2c_algorithm = {
-       .master_xfer            = s3c24xx_i2c_xfer,
-       .master_xfer_atomic     = s3c24xx_i2c_xfer_atomic,
-       .functionality          = s3c24xx_i2c_func,
+       .xfer = s3c24xx_i2c_xfer,
+       .xfer_atomic = s3c24xx_i2c_xfer_atomic,
+       .functionality = s3c24xx_i2c_func,
 };
 
 /*

diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 620f1259676375a5da0c7196652fac777c02513c..43f33988b98f6aa7a0a4da03609ce1d8db36b3e4 100644 (file)
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -379,8 +379,8 @@ static u32 sh7760_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm sh7760_i2c_algo = {
-       .master_xfer    = sh7760_i2c_master_xfer,
-       .functionality  = sh7760_i2c_func,
+       .xfer = sh7760_i2c_master_xfer,
+       .functionality = sh7760_i2c_func,
 };
 
 /* calculate CCR register setting for a desired scl clock.  SCL clock is

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index adfcee6c9fdccac0c0e576462302596646375200..dae8967f8749028b8b4f30420abad06ad7e51e47 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -740,8 +740,8 @@ static u32 sh_mobile_i2c_func(struct i2c_adapter *adapter)
 
 static const struct i2c_algorithm sh_mobile_i2c_algorithm = {
        .functionality = sh_mobile_i2c_func,
-       .master_xfer = sh_mobile_i2c_xfer,
-       .master_xfer_atomic = sh_mobile_i2c_xfer_atomic,
+       .xfer = sh_mobile_i2c_xfer,
+       .xfer_atomic = sh_mobile_i2c_xfer_atomic,
 };
 
 static const struct i2c_adapter_quirks sh_mobile_i2c_quirks = {

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 973a3a8c6d4a18644daabc22f7a244dbb2f5890e..e4aaeb2262d0578d0c66e7c8ae51e8751676abfb 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -2151,8 +2151,8 @@ static u32 stm32f7_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm stm32f7_i2c_algo = {
-       .master_xfer = stm32f7_i2c_xfer,
-       .master_xfer_atomic = stm32f7_i2c_xfer_atomic,
+       .xfer = stm32f7_i2c_xfer,
+       .xfer_atomic = stm32f7_i2c_xfer_atomic,
        .smbus_xfer = stm32f7_i2c_smbus_xfer,
        .functionality = stm32f7_i2c_func,
        .reg_slave = stm32f7_i2c_reg_slave,

diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
index 31f8d08e32a4852206f7c47f9abf0a90b4473881..1230f51e16241979e0f05ece67da334a821d9946 100644 (file)
--- a/drivers/i2c/busses/i2c-synquacer.c
+++ b/drivers/i2c/busses/i2c-synquacer.c
@@ -520,8 +520,8 @@ static u32 synquacer_i2c_functionality(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm synquacer_i2c_algo = {
-       .master_xfer    = synquacer_i2c_xfer,
-       .functionality  = synquacer_i2c_functionality,
+       .xfer = synquacer_i2c_xfer,
+       .functionality = synquacer_i2c_functionality,
 };
 
 static const struct i2c_adapter synquacer_i2c_ops = {

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 049b4d154c233705a50949ef8ff16a7c63ee2163..0862b98007f5474c0e1f4a46d5bcbb037cea1be0 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1440,9 +1440,9 @@ static u32 tegra_i2c_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm tegra_i2c_algo = {
-       .master_xfer            = tegra_i2c_xfer,
-       .master_xfer_atomic     = tegra_i2c_xfer_atomic,
-       .functionality          = tegra_i2c_func,
+       .xfer = tegra_i2c_xfer,
+       .xfer_atomic = tegra_i2c_xfer_atomic,
+       .functionality = tegra_i2c_func,
 };
 
 /* payload size is only 12 bit */

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 6bc1575cea6cbfac2d52b7a4aa357cb336943358..607026c921d68d9a16541ce49cf8bee93739e371 100644 (file)
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -1398,8 +1398,8 @@ static u32 xiic_func(struct i2c_adapter *adap)
 }
 
 static const struct i2c_algorithm xiic_algorithm = {
-       .master_xfer = xiic_xfer,
-       .master_xfer_atomic = xiic_xfer_atomic,
+       .xfer = xiic_xfer,
+       .xfer_atomic = xiic_xfer_atomic,
        .functionality = xiic_func,
 };
 

diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c
index 4d5e49b6321b81573def66ea3b120b522471164a..ddb1c3e8bc9d19d10050cf43eadfe3467d0f2e9b 100644 (file)
--- a/drivers/i2c/busses/i2c-xlp9xx.c
+++ b/drivers/i2c/busses/i2c-xlp9xx.c
@@ -452,7 +452,7 @@ static u32 xlp9xx_i2c_functionality(struct i2c_adapter *adapter)
 }
 
 static const struct i2c_algorithm xlp9xx_i2c_algo = {
-       .master_xfer = xlp9xx_i2c_xfer,
+       .xfer = xlp9xx_i2c_xfer,
        .functionality = xlp9xx_i2c_functionality,
 };
 

diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c
index be7d6d41e0b2526e377c1bec9b796344a709259e..dd194476b1184748d6ab417394a27274b442a15a 100644 (file)
--- a/drivers/i2c/i2c-atr.c
+++ b/drivers/i2c/i2c-atr.c
@@ -738,7 +738,7 @@ struct i2c_atr *i2c_atr_new(struct i2c_adapter *parent, struct device *dev,
        atr->flags = flags;
 
        if (parent->algo->master_xfer)
-               atr->algo.master_xfer = i2c_atr_master_xfer;
+               atr->algo.xfer = i2c_atr_master_xfer;
        if (parent->algo->smbus_xfer)
                atr->algo.smbus_xfer = i2c_atr_smbus_xfer;
        atr->algo.functionality = i2c_atr_functionality;

diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index fda72e8be885071c556df0cfb2174e91ef660f88..4d8690981a55dc0e1b35454971923791e6ed9f7f 100644 (file)
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -293,12 +293,12 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
         */
        if (parent->algo->master_xfer) {
                if (muxc->mux_locked)
-                       priv->algo.master_xfer = i2c_mux_master_xfer;
+                       priv->algo.xfer = i2c_mux_master_xfer;
                else
-                       priv->algo.master_xfer = __i2c_mux_master_xfer;
+                       priv->algo.xfer = __i2c_mux_master_xfer;
        }
        if (parent->algo->master_xfer_atomic)
-               priv->algo.master_xfer_atomic = priv->algo.master_xfer;
+               priv->algo.xfer_atomic = priv->algo.master_xfer;
 
        if (parent->algo->smbus_xfer) {
                if (muxc->mux_locked)

diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
index 77a740561fd777fa9f654144486bcb88cfd1fa1b..f2a1f47449789c05b8e7778352f089918909feae 100644 (file)
--- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
@@ -95,9 +95,9 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne
        priv->cur_chan = new_chan;
 
        /* Now fill out current adapter structure. cur_chan must be up to date */
-       priv->algo.master_xfer = i2c_demux_master_xfer;
+       priv->algo.xfer = i2c_demux_master_xfer;
        if (adap->algo->master_xfer_atomic)
-               priv->algo.master_xfer_atomic = i2c_demux_master_xfer;
+               priv->algo.xfer_atomic = i2c_demux_master_xfer;
        priv->algo.functionality = i2c_demux_functionality;
 
        snprintf(priv->cur_adap.name, sizeof(priv->cur_adap.name),