Merge tag 'v3.8-rc3' into v4l_for_linus
Linux 3.8-rc3 * tag 'v3.8-rc3': (11110 commits) Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struct cred drm/ttm: fix fence locking in ttm_buffer_object_transfer ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms drm/prime: drop reference on imported dma-buf come from gem xen/netfront: improve truesize tracking ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array sctp: fix Kconfig bug in default cookie hmac selection EDAC: Cleanup device deregistering path EDAC: Fix EDAC Kconfig menu EDAC: Fix kernel panic on module unloading ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec) ...
This commit is contained in:
Mauro Carvalho Chehab
@@ -540,8 +540,8 @@ static int init_device(struct i2c_client *client, struct adv7180_state *state)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __devinit int adv7180_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int adv7180_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct adv7180_state *state;
|
||||
struct v4l2_subdev *sd;
|
||||
@@ -587,7 +587,7 @@ err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static __devexit int adv7180_remove(struct i2c_client *client)
|
||||
static int adv7180_remove(struct i2c_client *client)
|
||||
{
|
||||
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
||||
struct adv7180_state *state = to_state(sd);
|
||||
@@ -652,7 +652,7 @@ static struct i2c_driver adv7180_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
},
|
||||
.probe = adv7180_probe,
|
||||
.remove = __devexit_p(adv7180_remove),
|
||||
.remove = adv7180_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = adv7180_suspend,
|
||||
.resume = adv7180_resume,
|
||||
|
||||
@@ -677,7 +677,7 @@ static struct i2c_driver adv7183_driver = {
|
||||
.name = "adv7183",
|
||||
},
|
||||
.probe = adv7183_probe,
|
||||
.remove = __devexit_p(adv7183_remove),
|
||||
.remove = adv7183_remove,
|
||||
.id_table = adv7183_id,
|
||||
};
|
||||
|
||||
|
||||
@@ -713,7 +713,7 @@ static int as3645a_resume(struct device *dev)
|
||||
* The number of LEDs reported in platform data is used to compute default
|
||||
* limits. Parameters passed through platform data can override those limits.
|
||||
*/
|
||||
static int __devinit as3645a_init_controls(struct as3645a *flash)
|
||||
static int as3645a_init_controls(struct as3645a *flash)
|
||||
{
|
||||
const struct as3645a_platform_data *pdata = flash->pdata;
|
||||
struct v4l2_ctrl *ctrl;
|
||||
@@ -804,8 +804,8 @@ static int __devinit as3645a_init_controls(struct as3645a *flash)
|
||||
return flash->ctrls.error;
|
||||
}
|
||||
|
||||
static int __devinit as3645a_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *devid)
|
||||
static int as3645a_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *devid)
|
||||
{
|
||||
struct as3645a *flash;
|
||||
int ret;
|
||||
@@ -846,7 +846,7 @@ done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit as3645a_remove(struct i2c_client *client)
|
||||
static int as3645a_remove(struct i2c_client *client)
|
||||
{
|
||||
struct v4l2_subdev *subdev = i2c_get_clientdata(client);
|
||||
struct as3645a *flash = to_as3645a(subdev);
|
||||
@@ -877,7 +877,7 @@ static struct i2c_driver as3645a_i2c_driver = {
|
||||
.pm = &as3645a_pm_ops,
|
||||
},
|
||||
.probe = as3645a_probe,
|
||||
.remove = __devexit_p(as3645a_remove),
|
||||
.remove = as3645a_remove,
|
||||
.id_table = as3645a_id_table,
|
||||
};
|
||||
|
||||
|
||||
@@ -926,8 +926,8 @@ static irqreturn_t m5mols_irq_handler(int irq, void *data)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit m5mols_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int m5mols_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
const struct m5mols_platform_data *pdata = client->dev.platform_data;
|
||||
struct m5mols_info *info;
|
||||
@@ -1018,7 +1018,7 @@ out_free:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit m5mols_remove(struct i2c_client *client)
|
||||
static int m5mols_remove(struct i2c_client *client)
|
||||
{
|
||||
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
||||
struct m5mols_info *info = to_m5mols(sd);
|
||||
@@ -1045,7 +1045,7 @@ static struct i2c_driver m5mols_i2c_driver = {
|
||||
.name = MODULE_NAME,
|
||||
},
|
||||
.probe = m5mols_probe,
|
||||
.remove = __devexit_p(m5mols_remove),
|
||||
.remove = m5mols_remove,
|
||||
.id_table = m5mols_id,
|
||||
};
|
||||
|
||||
|
||||
@@ -788,7 +788,7 @@ static const struct v4l2_subdev_ops vs6624_ops = {
|
||||
.video = &vs6624_video_ops,
|
||||
};
|
||||
|
||||
static int __devinit vs6624_probe(struct i2c_client *client,
|
||||
static int vs6624_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct vs6624 *sensor;
|
||||
@@ -881,7 +881,7 @@ static int __devinit vs6624_probe(struct i2c_client *client,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit vs6624_remove(struct i2c_client *client)
|
||||
static int vs6624_remove(struct i2c_client *client)
|
||||
{
|
||||
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
||||
struct vs6624 *sensor = to_vs6624(sd);
|
||||
@@ -906,7 +906,7 @@ static struct i2c_driver vs6624_driver = {
|
||||
.name = "vs6624",
|
||||
},
|
||||
.probe = vs6624_probe,
|
||||
.remove = __devexit_p(vs6624_remove),
|
||||
.remove = vs6624_remove,
|
||||
.id_table = vs6624_id,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user