diff options
author | Vadim Pasternak <vadimp@mellanox.com> | 2018-01-22 21:43:27 -0500 |
---|---|---|
committer | Darren Hart (VMware) <dvhart@infradead.org> | 2018-01-31 13:36:49 -0500 |
commit | 3d838f5514ca5318f46bdb5b3f997cee66091695 (patch) | |
tree | 50c4992eec82a92c48212f161ce3eae17de5e57a /drivers/platform/x86/mlx-platform.c | |
parent | 4abdbfa7331ef5a79a6f89d2d8061ac085878756 (diff) |
platform/mellanox: Rename i2c bus to nr
Use Linux convention of nr instead of bus for i2c adapter number.
Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
[dvhart: refactored commit into smaller functional changes]
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Diffstat (limited to 'drivers/platform/x86/mlx-platform.c')
-rw-r--r-- | drivers/platform/x86/mlx-platform.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c index 0fbec1f1ca40..56017143d6a9 100644 --- a/drivers/platform/x86/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c | |||
@@ -141,41 +141,41 @@ static struct i2c_mux_reg_platform_data mlxplat_mux_data[] = { | |||
141 | static struct mlxreg_hotplug_device mlxplat_mlxcpld_psu[] = { | 141 | static struct mlxreg_hotplug_device mlxplat_mlxcpld_psu[] = { |
142 | { | 142 | { |
143 | .brdinfo = { I2C_BOARD_INFO("24c02", 0x51) }, | 143 | .brdinfo = { I2C_BOARD_INFO("24c02", 0x51) }, |
144 | .bus = 10, | 144 | .nr = 10, |
145 | }, | 145 | }, |
146 | { | 146 | { |
147 | .brdinfo = { I2C_BOARD_INFO("24c02", 0x50) }, | 147 | .brdinfo = { I2C_BOARD_INFO("24c02", 0x50) }, |
148 | .bus = 10, | 148 | .nr = 10, |
149 | }, | 149 | }, |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static struct mlxreg_hotplug_device mlxplat_mlxcpld_pwr[] = { | 152 | static struct mlxreg_hotplug_device mlxplat_mlxcpld_pwr[] = { |
153 | { | 153 | { |
154 | .brdinfo = { I2C_BOARD_INFO("dps460", 0x59) }, | 154 | .brdinfo = { I2C_BOARD_INFO("dps460", 0x59) }, |
155 | .bus = 10, | 155 | .nr = 10, |
156 | }, | 156 | }, |
157 | { | 157 | { |
158 | .brdinfo = { I2C_BOARD_INFO("dps460", 0x58) }, | 158 | .brdinfo = { I2C_BOARD_INFO("dps460", 0x58) }, |
159 | .bus = 10, | 159 | .nr = 10, |
160 | }, | 160 | }, |
161 | }; | 161 | }; |
162 | 162 | ||
163 | static struct mlxreg_hotplug_device mlxplat_mlxcpld_fan[] = { | 163 | static struct mlxreg_hotplug_device mlxplat_mlxcpld_fan[] = { |
164 | { | 164 | { |
165 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, | 165 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, |
166 | .bus = 11, | 166 | .nr = 11, |
167 | }, | 167 | }, |
168 | { | 168 | { |
169 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, | 169 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, |
170 | .bus = 12, | 170 | .nr = 12, |
171 | }, | 171 | }, |
172 | { | 172 | { |
173 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, | 173 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, |
174 | .bus = 13, | 174 | .nr = 13, |
175 | }, | 175 | }, |
176 | { | 176 | { |
177 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, | 177 | .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, |
178 | .bus = 14, | 178 | .nr = 14, |
179 | }, | 179 | }, |
180 | }; | 180 | }; |
181 | 181 | ||