mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
i2c: Discard the i2c algo del_bus wrappers
They are all only calling i2c_del_adapter, so we may as well do it directly. Signed-off-by: Jean Delvare <[email protected]>
This commit is contained in:
parent
6b65cd7428
commit
3269711b76
36 changed files with 45 additions and 84 deletions
|
|
@ -120,19 +120,19 @@ void radeon_create_i2c_busses(struct radeonfb_info *rinfo)
|
|||
void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
|
||||
{
|
||||
if (rinfo->i2c[0].rinfo)
|
||||
i2c_bit_del_bus(&rinfo->i2c[0].adapter);
|
||||
i2c_del_adapter(&rinfo->i2c[0].adapter);
|
||||
rinfo->i2c[0].rinfo = NULL;
|
||||
|
||||
if (rinfo->i2c[1].rinfo)
|
||||
i2c_bit_del_bus(&rinfo->i2c[1].adapter);
|
||||
i2c_del_adapter(&rinfo->i2c[1].adapter);
|
||||
rinfo->i2c[1].rinfo = NULL;
|
||||
|
||||
if (rinfo->i2c[2].rinfo)
|
||||
i2c_bit_del_bus(&rinfo->i2c[2].adapter);
|
||||
i2c_del_adapter(&rinfo->i2c[2].adapter);
|
||||
rinfo->i2c[2].rinfo = NULL;
|
||||
|
||||
if (rinfo->i2c[3].rinfo)
|
||||
i2c_bit_del_bus(&rinfo->i2c[3].adapter);
|
||||
i2c_del_adapter(&rinfo->i2c[3].adapter);
|
||||
rinfo->i2c[3].rinfo = NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -137,15 +137,15 @@ void i810_create_i2c_busses(struct i810fb_par *par)
|
|||
void i810_delete_i2c_busses(struct i810fb_par *par)
|
||||
{
|
||||
if (par->chan[0].par)
|
||||
i2c_bit_del_bus(&par->chan[0].adapter);
|
||||
i2c_del_adapter(&par->chan[0].adapter);
|
||||
par->chan[0].par = NULL;
|
||||
|
||||
if (par->chan[1].par)
|
||||
i2c_bit_del_bus(&par->chan[1].adapter);
|
||||
i2c_del_adapter(&par->chan[1].adapter);
|
||||
par->chan[1].par = NULL;
|
||||
|
||||
if (par->chan[2].par)
|
||||
i2c_bit_del_bus(&par->chan[2].adapter);
|
||||
i2c_del_adapter(&par->chan[2].adapter);
|
||||
par->chan[2].par = NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -188,11 +188,11 @@ void intelfb_delete_i2c_busses(struct intelfb_info *dinfo)
|
|||
|
||||
for (i = 0; i < MAX_OUTPUTS; i++) {
|
||||
if (dinfo->output[i].i2c_bus.dinfo) {
|
||||
i2c_bit_del_bus(&dinfo->output[i].i2c_bus.adapter);
|
||||
i2c_del_adapter(&dinfo->output[i].i2c_bus.adapter);
|
||||
dinfo->output[i].i2c_bus.dinfo = NULL;
|
||||
}
|
||||
if (dinfo->output[i].ddc_bus.dinfo) {
|
||||
i2c_bit_del_bus(&dinfo->output[i].ddc_bus.adapter);
|
||||
i2c_del_adapter(&dinfo->output[i].ddc_bus.adapter);
|
||||
dinfo->output[i].ddc_bus.dinfo = NULL;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
|
|||
|
||||
static void i2c_bit_bus_del(struct i2c_bit_adapter* b) {
|
||||
if (b->initialized) {
|
||||
i2c_bit_del_bus(&b->adapter);
|
||||
i2c_del_adapter(&b->adapter);
|
||||
b->initialized = 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -147,15 +147,15 @@ void nvidia_create_i2c_busses(struct nvidia_par *par)
|
|||
void nvidia_delete_i2c_busses(struct nvidia_par *par)
|
||||
{
|
||||
if (par->chan[0].par)
|
||||
i2c_bit_del_bus(&par->chan[0].adapter);
|
||||
i2c_del_adapter(&par->chan[0].adapter);
|
||||
par->chan[0].par = NULL;
|
||||
|
||||
if (par->chan[1].par)
|
||||
i2c_bit_del_bus(&par->chan[1].adapter);
|
||||
i2c_del_adapter(&par->chan[1].adapter);
|
||||
par->chan[1].par = NULL;
|
||||
|
||||
if (par->chan[2].par)
|
||||
i2c_bit_del_bus(&par->chan[2].adapter);
|
||||
i2c_del_adapter(&par->chan[2].adapter);
|
||||
par->chan[2].par = NULL;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,15 +144,15 @@ void riva_create_i2c_busses(struct riva_par *par)
|
|||
void riva_delete_i2c_busses(struct riva_par *par)
|
||||
{
|
||||
if (par->chan[0].par)
|
||||
i2c_bit_del_bus(&par->chan[0].adapter);
|
||||
i2c_del_adapter(&par->chan[0].adapter);
|
||||
par->chan[0].par = NULL;
|
||||
|
||||
if (par->chan[1].par)
|
||||
i2c_bit_del_bus(&par->chan[1].adapter);
|
||||
i2c_del_adapter(&par->chan[1].adapter);
|
||||
par->chan[1].par = NULL;
|
||||
|
||||
if (par->chan[2].par)
|
||||
i2c_bit_del_bus(&par->chan[2].adapter);
|
||||
i2c_del_adapter(&par->chan[2].adapter);
|
||||
par->chan[2].par = NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ void savagefb_delete_i2c_busses(struct fb_info *info)
|
|||
struct savagefb_par *par = info->par;
|
||||
|
||||
if (par->chan.par)
|
||||
i2c_bit_del_bus(&par->chan.adapter);
|
||||
i2c_del_adapter(&par->chan.adapter);
|
||||
|
||||
par->chan.par = NULL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue