Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git] / drivers / media / video / wm8775.c
index 9f7e894ef962cdc4d76baec111aacb99fa700261..869f9e7946b6082bb9df221ccc056d13e808e0d9 100644 (file)
@@ -34,6 +34,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("wm8775 driver");
 MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
@@ -44,6 +45,7 @@ static unsigned short normal_i2c[] = { 0x36 >> 1, I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;
 
+
 /* ----------------------------------------------------------------------- */
 
 enum {
@@ -66,18 +68,15 @@ static int wm8775_write(struct i2c_client *client, int reg, u16 val)
                return -1;
        }
 
-       for (i = 0; i < 3; i++) {
-               if (i2c_smbus_write_byte_data(client, (reg << 1) |
-                                       (val >> 8), val & 0xff) == 0) {
+       for (i = 0; i < 3; i++)
+               if (i2c_smbus_write_byte_data(client,
+                               (reg << 1) | (val >> 8), val & 0xff) == 0)
                        return 0;
-               }
-       }
        v4l_err(client, "I2C: cannot write %03x to register R%d\n", val, reg);
        return -1;
 }
 
-static int wm8775_command(struct i2c_client *client, unsigned int cmd,
-                         void *arg)
+static int wm8775_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
        struct wm8775_state *state = i2c_get_clientdata(client);
        struct v4l2_routing *route = arg;
@@ -126,7 +125,8 @@ static int wm8775_command(struct i2c_client *client, unsigned int cmd,
                break;
 
        case VIDIOC_G_CHIP_IDENT:
-               return v4l2_chip_ident_i2c_client(client, arg, V4L2_IDENT_WM8775, 0);
+               return v4l2_chip_ident_i2c_client(client,
+                               arg, V4L2_IDENT_WM8775, 0);
 
        case VIDIOC_LOG_STATUS:
                v4l_info(client, "Input: %d%s\n", state->input,
@@ -159,105 +159,67 @@ static int wm8775_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 wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
+static int wm8775_probe(struct i2c_client *client)
 {
-       struct i2c_client *client;
        struct wm8775_state *state;
 
        /* Check if the adapter supports the needed features */
-       if (!i2c_check_functionality(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, "wm8775");
+       if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+               return -EIO;
 
-       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 = kmalloc(sizeof(struct wm8775_state), GFP_KERNEL);
-       if (state == NULL) {
-               kfree(client);
+       if (state == NULL)
                return -ENOMEM;
-       }
        state->input = 2;
        state->muted = 0;
        i2c_set_clientdata(client, state);
 
-       /* initialize wm8775 */
-       wm8775_write(client, R23, 0x000);       /* RESET */
-       wm8775_write(client, R7, 0x000);        /* Disable zero cross detect timeout */
-       wm8775_write(client, R11, 0x021);       /* Left justified, 24-bit mode */
-       wm8775_write(client, R12, 0x102);       /* Master mode, clock ratio 256fs */
-       wm8775_write(client, R13, 0x000);       /* Powered up */
-       wm8775_write(client, R14, 0x1d4);       /* ADC gain +2.5dB, enable zero cross */
-       wm8775_write(client, R15, 0x1d4);       /* ADC gain +2.5dB, enable zero cross */
-       wm8775_write(client, R16, 0x1bf);       /* ALC Stereo, ALC target level -1dB FS */
-       /* max gain +8dB */
-       wm8775_write(client, R17, 0x185);       /* Enable gain control, use zero cross */
-       /* detection, ALC hold time 42.6 ms */
-       wm8775_write(client, R18, 0x0a2);       /* ALC gain ramp up delay 34 s, */
-       /* ALC gain ramp down delay 33 ms */
-       wm8775_write(client, R19, 0x005);       /* Enable noise gate, threshold -72dBfs */
-       wm8775_write(client, R20, 0x07a);       /* Transient window 4ms, lower PGA gain */
-       /* limit -1dB */
-       wm8775_write(client, R21, 0x102);       /* LRBOTH = 1, use input 2. */
-       i2c_attach_client(client);
-
+       /* Initialize wm8775 */
+
+       /* RESET */
+       wm8775_write(client, R23, 0x000);
+       /* Disable zero cross detect timeout */
+       wm8775_write(client, R7, 0x000);
+       /* Left justified, 24-bit mode */
+       wm8775_write(client, R11, 0x021);
+       /* Master mode, clock ratio 256fs */
+       wm8775_write(client, R12, 0x102);
+       /* Powered up */
+       wm8775_write(client, R13, 0x000);
+       /* ADC gain +2.5dB, enable zero cross */
+       wm8775_write(client, R14, 0x1d4);
+       /* ADC gain +2.5dB, enable zero cross */
+       wm8775_write(client, R15, 0x1d4);
+       /* ALC Stereo, ALC target level -1dB FS max gain +8dB */
+       wm8775_write(client, R16, 0x1bf);
+       /* Enable gain control, use zero cross detection,
+          ALC hold time 42.6 ms */
+       wm8775_write(client, R17, 0x185);
+       /* ALC gain ramp up delay 34 s, ALC gain ramp down delay 33 ms */
+       wm8775_write(client, R18, 0x0a2);
+       /* Enable noise gate, threshold -72dBfs */
+       wm8775_write(client, R19, 0x005);
+       /* Transient window 4ms, lower PGA gain limit -1dB */
+       wm8775_write(client, R20, 0x07a);
+       /* LRBOTH = 1, use input 2. */
+       wm8775_write(client, R21, 0x102);
        return 0;
 }
 
-static int wm8775_probe(struct i2c_adapter *adapter)
+static int wm8775_remove(struct i2c_client *client)
 {
-       if (adapter->class & I2C_CLASS_TV_ANALOG)
-               return i2c_probe(adapter, &addr_data, wm8775_attach);
+       kfree(i2c_get_clientdata(client));
        return 0;
 }
 
-static int wm8775_detach(struct i2c_client *client)
-{
-       struct wm8775_state *state = i2c_get_clientdata(client);
-       int err;
-
-       err = i2c_detach_client(client);
-       if (err) {
-               return err;
-       }
-       kfree(state);
-       kfree(client);
-
-       return 0;
-}
-
-/* ----------------------------------------------------------------------- */
-
-/* i2c implementation */
-static struct i2c_driver i2c_driver = {
-       .driver = {
-               .name = "wm8775",
-       },
-       .id             = I2C_DRIVERID_WM8775,
-       .attach_adapter = wm8775_probe,
-       .detach_client  = wm8775_detach,
-       .command        = wm8775_command,
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+       .name = "wm8775",
+       .driverid = I2C_DRIVERID_WM8775,
+       .command = wm8775_command,
+       .probe = wm8775_probe,
+       .remove = wm8775_remove,
 };
 
-
-static int __init wm8775_init_module(void)
-{
-       return i2c_add_driver(&i2c_driver);
-}
-
-static void __exit wm8775_cleanup_module(void)
-{
-       i2c_del_driver(&i2c_driver);
-}
-
-module_init(wm8775_init_module);
-module_exit(wm8775_cleanup_module);