leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (6454): vp27smpx: convert to bus-based I2C API

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2007-09-13 11:11:44 -03:00 committed by Mauro Carvalho Chehab
parent 49457cc279
commit 45eea27624
1 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
drivers/media/video/vp27smpx.c
View File

@ -30,6 +30,7 @@
#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
#include <media/v4l2-i2c-drv-legacy.h>
MODULE_DESCRIPTION("vp27smpx driver");
MODULE_AUTHOR("Hans Verkuil");
@ -73,8 +74,7 @@ static void vp27smpx_set_audmode(struct i2c_client *client, u32 audmode)
}
}
static int vp27smpx_command(struct i2c_client *client, unsigned int cmd,
void *arg)
static int vp27smpx_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
struct vp27smpx_state *state = i2c_get_clientdata(client);
struct v4l2_tuner *vt = arg;
@ -125,31 +125,20 @@ static int vp27smpx_command(struct i2c_client *client, unsigned int cmd,
* concerning the addresses: i2c wants 7 bit (without the r/w bit), so '>>1'
*/
static struct i2c_driver i2c_driver;
static int vp27smpx_attach(struct i2c_adapter *adapter, int address, int kind)
static int vp27smpx_probe(struct i2c_client *client)
{
struct i2c_client *client;
struct vp27smpx_state *state;
/* Check if the adapter supports the needed features */
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == 0)
return -ENOMEM;
client->addr = address;
client->adapter = adapter;
client->driver = &i2c_driver;
snprintf(client->name, sizeof(client->name) - 1, "vp27smpx");
v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name);
v4l_info(client, "chip found @ 0x%x (%s)\n", client->addr << 1, client->adapter->name);
state = kzalloc(sizeof(struct vp27smpx_state), GFP_KERNEL);
if (state == NULL) {
kfree(client);
return -ENOMEM;
}
state->audmode = V4L2_TUNER_MODE_STEREO;
@ -157,56 +146,22 @@ static int vp27smpx_attach(struct i2c_adapter *adapter, int address, int kind)
/* initialize vp27smpx */
vp27smpx_set_audmode(client, state->audmode);
i2c_attach_client(client);
return 0;
}
static int vp27smpx_probe(struct i2c_adapter *adapter)
static int vp27smpx_remove(struct i2c_client *client)
{
if (adapter->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adapter, &addr_data, vp27smpx_attach);
return 0;
}
static int vp27smpx_detach(struct i2c_client *client)
{
struct vp27smpx_state *state = i2c_get_clientdata(client);
int err;
err = i2c_detach_client(client);
if (err) {
return err;
}
kfree(state);
kfree(client);
kfree(i2c_get_clientdata(client));
return 0;
}
/* ----------------------------------------------------------------------- */
/* i2c implementation */
static struct i2c_driver i2c_driver = {
.driver = {
.name = "vp27smpx",
},
.id = I2C_DRIVERID_VP27SMPX,
.attach_adapter = vp27smpx_probe,
.detach_client = vp27smpx_detach,
.command = vp27smpx_command,
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "vp27smpx",
.driverid = I2C_DRIVERID_VP27SMPX,
.command = vp27smpx_command,
.probe = vp27smpx_probe,
.remove = vp27smpx_remove,
};
static int __init vp27smpx_init_module(void)
{
return i2c_add_driver(&i2c_driver);
}
static void __exit vp27smpx_cleanup_module(void)
{
i2c_del_driver(&i2c_driver);
}
module_init(vp27smpx_init_module);
module_exit(vp27smpx_cleanup_module);