Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 1f483c1d0dbe..8150200511da 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -67,9 +67,9 @@ static const char *get_fw_name(struct i2c_client *client)
 
         if (firmware[0])
                 return firmware;
-        if (state->is_cx23885)
+        if (is_cx2388x(state))
                 return "v4l-cx23885-avcore-01.fw";
-        if (state->is_cx231xx)
+        if (is_cx231xx(state))
                 return "v4l-cx231xx-avcore-01.fw";
         return "v4l-cx25840.fw";
 }
@@ -112,13 +112,13 @@ int cx25840_loadfw(struct i2c_client *client)
         int MAX_BUF_SIZE = FWSEND;
         u32 gpio_oe = 0, gpio_da = 0;
 
-        if (state->is_cx23885) {
+        if (is_cx2388x(state)) {
                 /* Preserve the GPIO OE and output bits */
                 gpio_oe = cx25840_read(client, 0x160);
                 gpio_da = cx25840_read(client, 0x164);
         }
 
-        if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
+        if (is_cx231xx(state) && MAX_BUF_SIZE > 16) {
                 v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
                 MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */
         }
@@ -156,7 +156,7 @@ int cx25840_loadfw(struct i2c_client *client)
         size = fw->size;
         release_firmware(fw);
 
-        if (state->is_cx23885) {
+        if (is_cx2388x(state)) {
                 /* Restore GPIO configuration after f/w load */
                 cx25840_write(client, 0x160, gpio_oe);
                 cx25840_write(client, 0x164, gpio_da);