diff options
Diffstat (limited to 'drivers/media/video/tvaudio.c')
| -rw-r--r-- | drivers/media/video/tvaudio.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index c31bf28b73fe..5b20e8177cad 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
| @@ -188,7 +188,7 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val) | |||
| 188 | buffer[1] = val; | 188 | buffer[1] = val; |
| 189 | if (2 != i2c_master_send(&chip->c,buffer,2)) { | 189 | if (2 != i2c_master_send(&chip->c,buffer,2)) { |
| 190 | tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n", | 190 | tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n", |
| 191 | chip->c.name, subaddr, val); | 191 | chip->c.name, subaddr, val); |
| 192 | return -1; | 192 | return -1; |
| 193 | } | 193 | } |
| 194 | } | 194 | } |
| @@ -216,7 +216,7 @@ static int chip_read(struct CHIPSTATE *chip) | |||
| 216 | chip->c.name); | 216 | chip->c.name); |
| 217 | return -1; | 217 | return -1; |
| 218 | } | 218 | } |
| 219 | tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name,buffer); | 219 | tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer); |
| 220 | return buffer; | 220 | return buffer; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| @@ -235,7 +235,7 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr) | |||
| 235 | return -1; | 235 | return -1; |
| 236 | } | 236 | } |
| 237 | tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n", | 237 | tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n", |
| 238 | chip->c.name,subaddr,read[0]); | 238 | chip->c.name, subaddr,read[0]); |
| 239 | return read[0]; | 239 | return read[0]; |
| 240 | } | 240 | } |
| 241 | 241 | ||
| @@ -248,7 +248,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd) | |||
| 248 | 248 | ||
| 249 | /* update our shadow register set; print bytes if (debug > 0) */ | 249 | /* update our shadow register set; print bytes if (debug > 0) */ |
| 250 | tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:", | 250 | tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:", |
| 251 | chip->c.name,name,cmd->bytes[0]); | 251 | chip->c.name, name,cmd->bytes[0]); |
| 252 | for (i = 1; i < cmd->count; i++) { | 252 | for (i = 1; i < cmd->count; i++) { |
| 253 | if (debug) | 253 | if (debug) |
| 254 | printk(" 0x%x",cmd->bytes[i]); | 254 | printk(" 0x%x",cmd->bytes[i]); |
| @@ -322,7 +322,7 @@ static void generic_checkmode(struct CHIPSTATE *chip) | |||
| 322 | int mode = desc->getmode(chip); | 322 | int mode = desc->getmode(chip); |
| 323 | 323 | ||
| 324 | if (mode == chip->prevmode) | 324 | if (mode == chip->prevmode) |
| 325 | return; | 325 | return; |
| 326 | 326 | ||
| 327 | tvaudio_dbg("%s: thread checkmode\n", chip->c.name); | 327 | tvaudio_dbg("%s: thread checkmode\n", chip->c.name); |
| 328 | chip->prevmode = mode; | 328 | chip->prevmode = mode; |
| @@ -1506,18 +1506,18 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind) | |||
| 1506 | return -EIO; | 1506 | return -EIO; |
| 1507 | } | 1507 | } |
| 1508 | tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name); | 1508 | tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name); |
| 1509 | if (desc->flags) { | 1509 | if (desc->flags) { |
| 1510 | tvaudio_dbg("matches:%s%s%s.\n", | 1510 | tvaudio_dbg("matches:%s%s%s.\n", |
| 1511 | (desc->flags & CHIP_HAS_VOLUME) ? " volume" : "", | 1511 | (desc->flags & CHIP_HAS_VOLUME) ? " volume" : "", |
| 1512 | (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "", | 1512 | (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "", |
| 1513 | (desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : ""); | 1513 | (desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : ""); |
| 1514 | } | 1514 | } |
| 1515 | 1515 | ||
| 1516 | /* fill required data structures */ | 1516 | /* fill required data structures */ |
| 1517 | strcpy(chip->c.name,desc->name); | 1517 | strcpy(chip->c.name, desc->name); |
| 1518 | chip->type = desc-chiplist; | 1518 | chip->type = desc-chiplist; |
| 1519 | chip->shadow.count = desc->registers+1; | 1519 | chip->shadow.count = desc->registers+1; |
| 1520 | chip->prevmode = -1; | 1520 | chip->prevmode = -1; |
| 1521 | /* register */ | 1521 | /* register */ |
| 1522 | i2c_attach_client(&chip->c); | 1522 | i2c_attach_client(&chip->c); |
| 1523 | 1523 | ||
| @@ -1604,7 +1604,7 @@ static int chip_command(struct i2c_client *client, | |||
| 1604 | struct CHIPSTATE *chip = i2c_get_clientdata(client); | 1604 | struct CHIPSTATE *chip = i2c_get_clientdata(client); |
| 1605 | struct CHIPDESC *desc = chiplist + chip->type; | 1605 | struct CHIPDESC *desc = chiplist + chip->type; |
| 1606 | 1606 | ||
| 1607 | tvaudio_dbg("%s: chip_command 0x%x\n",chip->c.name,cmd); | 1607 | tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd); |
| 1608 | 1608 | ||
| 1609 | switch (cmd) { | 1609 | switch (cmd) { |
| 1610 | case AUDC_SET_INPUT: | 1610 | case AUDC_SET_INPUT: |
| @@ -1624,7 +1624,7 @@ static int chip_command(struct i2c_client *client, | |||
| 1624 | 1624 | ||
| 1625 | /* --- v4l ioctls --- */ | 1625 | /* --- v4l ioctls --- */ |
| 1626 | /* take care: bttv does userspace copying, we'll get a | 1626 | /* take care: bttv does userspace copying, we'll get a |
| 1627 | kernel pointer here... */ | 1627 | kernel pointer here... */ |
| 1628 | case VIDIOCGAUDIO: | 1628 | case VIDIOCGAUDIO: |
| 1629 | { | 1629 | { |
| 1630 | struct video_audio *va = arg; | 1630 | struct video_audio *va = arg; |
