hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/media/i2c/maxim4c/remote_max96715.c
....@@ -190,7 +190,6 @@
190190 {
191191 struct device *dev = max96715->dev;
192192 struct i2c_client *client = max96715->client;
193
- struct maxim4c *maxim4c = max96715->local;
194193 int ret = 0;
195194
196195 ret = maxim4c_remote_i2c_addr_select(max96715, MAXIM4C_I2C_SER_DEF);
....@@ -206,16 +205,9 @@
206205 return ret;
207206
208207 #if MAX96715_MODE_SWITCH
209
- if (maxim4c->hot_plug_irq > 0)
210
- disable_irq(maxim4c->hot_plug_irq);
211
-
212208 ret = max96715_link_mode_select(max96715, LINK_MODE_CONFIG);
213
- if (ret) {
214
- if (maxim4c->hot_plug_irq > 0)
215
- enable_irq(maxim4c->hot_plug_irq);
216
-
209
+ if (ret)
217210 return ret;
218
- }
219211 #endif
220212
221213 ret = maxim4c_i2c_run_init_seq(client,
....@@ -225,16 +217,11 @@
225217 dev_err(dev, "remote id = %d init sequence error\n",
226218 max96715->remote_id);
227219
228
- if (maxim4c->hot_plug_irq > 0)
229
- enable_irq(maxim4c->hot_plug_irq);
230
-
231220 return ret;
232221 }
233222
234223 #if MAX96715_MODE_SWITCH
235224 ret = max96715_link_mode_select(max96715, LINK_MODE_VIDEO);
236
- if (maxim4c->hot_plug_irq > 0)
237
- enable_irq(maxim4c->hot_plug_irq);
238225 if (ret)
239226 return ret;
240227 #endif
....@@ -388,7 +375,7 @@
388375 .probe = max96715_probe,
389376 .remove = max96715_remove,
390377 .driver = {
391
- .name = "max96715",
378
+ .name = "maxim4c-max96715",
392379 .of_match_table = max96715_of_table,
393380 },
394381 };