Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 92607
b: refs/heads/master
c: fb9393b
h: refs/heads/master
i:
  92605: 9c9dae1
  92603: 6dc69e8
  92599: f0f4756
  92591: daaffd5
  92575: e4dafbb
  92543: 7f85b0b
v: v3
  • Loading branch information
Harvey Harrison authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent f405082 commit 6f79ec2
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3ca7fc84e37c5cf446fe4137f885f74e71373d7f
refs/heads/master: fb9393b519fb27714d14625bc3042b669933e81a
44 changes: 22 additions & 22 deletions trunk/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ static int ttusb_cmd(struct ttusb *ttusb,
(u8 *) data, len, &actual_len, 1000);
if (err != 0) {
dprintk("%s: usb_bulk_msg(send) failed, err == %i!\n",
__FUNCTION__, err);
__func__, err);
mutex_unlock(&ttusb->semusb);
return err;
}
if (actual_len != len) {
dprintk("%s: only wrote %d of %d bytes\n", __FUNCTION__,
dprintk("%s: only wrote %d of %d bytes\n", __func__,
actual_len, len);
mutex_unlock(&ttusb->semusb);
return -1;
Expand All @@ -168,7 +168,7 @@ static int ttusb_cmd(struct ttusb *ttusb,
ttusb->last_result, 32, &actual_len, 1000);

if (err != 0) {
printk("%s: failed, receive error %d\n", __FUNCTION__,
printk("%s: failed, receive error %d\n", __func__,
err);
mutex_unlock(&ttusb->semusb);
return err;
Expand Down Expand Up @@ -229,7 +229,7 @@ static int ttusb_i2c_msg(struct ttusb *ttusb,
if (err || b[0] != 0x55 || b[1] != id) {
dprintk
("%s: usb_bulk_msg(recv) failed, err == %i, id == %02x, b == ",
__FUNCTION__, err, id);
__func__, err, id);
return -EREMOTEIO;
}

Expand Down Expand Up @@ -273,7 +273,7 @@ static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num
snd_buf, snd_len, rcv_buf, rcv_len);

if (err < rcv_len) {
dprintk("%s: i == %i\n", __FUNCTION__, i);
dprintk("%s: i == %i\n", __func__, i);
break;
}

Expand Down Expand Up @@ -327,7 +327,7 @@ static int ttusb_boot_dsp(struct ttusb *ttusb)
done:
if (err) {
dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
__FUNCTION__, err);
__func__, err);
}

return err;
Expand Down Expand Up @@ -427,7 +427,7 @@ static int ttusb_init_controller(struct ttusb *ttusb)
if ((err = ttusb_result(ttusb, get_version, sizeof(get_version))))
return err;

dprintk("%s: stc-version: %c%c%c%c%c\n", __FUNCTION__,
dprintk("%s: stc-version: %c%c%c%c%c\n", __func__,
get_version[4], get_version[5], get_version[6],
get_version[7], get_version[8]);

Expand All @@ -437,7 +437,7 @@ static int ttusb_init_controller(struct ttusb *ttusb)
memcmp(get_version + 4, "V 2.2", 5)) {
printk
("%s: unknown STC version %c%c%c%c%c, please report!\n",
__FUNCTION__, get_version[4], get_version[5],
__func__, get_version[4], get_version[5],
get_version[6], get_version[7], get_version[8]);
}

Expand All @@ -453,7 +453,7 @@ static int ttusb_init_controller(struct ttusb *ttusb)
ttusb_result(ttusb, get_dsp_version, sizeof(get_dsp_version));
if (err)
return err;
printk("%s: dsp-version: %c%c%c\n", __FUNCTION__,
printk("%s: dsp-version: %c%c%c\n", __func__,
get_dsp_version[4], get_dsp_version[5], get_dsp_version[6]);
return 0;
}
Expand All @@ -476,7 +476,7 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe,
/* Diseqc */
if ((err = ttusb_cmd(ttusb, b, 4 + b[3], 0))) {
dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
__FUNCTION__, err);
__func__, err);
}

return err;
Expand All @@ -494,7 +494,7 @@ static int ttusb_update_lnb(struct ttusb *ttusb)
/* SetLNB */
if ((err = ttusb_cmd(ttusb, b, sizeof(b), 0))) {
dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
__FUNCTION__, err);
__func__, err);
}

return err;
Expand Down Expand Up @@ -528,7 +528,7 @@ static void ttusb_set_led_freq(struct ttusb *ttusb, u8 freq)
err = ttusb_cmd(ttusb, b, sizeof(b), 0);
if (err) {
dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
__FUNCTION__, err);
__func__, err);
}
}
#endif
Expand All @@ -554,7 +554,7 @@ static void ttusb_process_muxpack(struct ttusb *ttusb, const u8 * muxpack,
csum ^= le16_to_cpup((u16 *) (muxpack + i));
if (csum) {
printk("%s: muxpack with incorrect checksum, ignoring\n",
__FUNCTION__);
__func__);
numinvalid++;
return;
}
Expand All @@ -563,7 +563,7 @@ static void ttusb_process_muxpack(struct ttusb *ttusb, const u8 * muxpack,
cc &= 0x7FFF;
if ((cc != ttusb->cc) && (ttusb->cc != -1))
printk("%s: cc discontinuity (%d frames missing)\n",
__FUNCTION__, (cc - ttusb->cc) & 0x7FFF);
__func__, (cc - ttusb->cc) & 0x7FFF);
ttusb->cc = (cc + 1) & 0x7FFF;
if (muxpack[0] & 0x80) {
#ifdef TTUSB_HWSECTIONS
Expand Down Expand Up @@ -613,7 +613,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
int maxwork = 1024;
while (len) {
if (!(maxwork--)) {
printk("%s: too much work\n", __FUNCTION__);
printk("%s: too much work\n", __func__);
break;
}

Expand All @@ -632,7 +632,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
#else
if (ttusb->insync) {
printk("%s: lost sync.\n",
__FUNCTION__);
__func__);
ttusb->insync = 0;
}
#endif
Expand Down Expand Up @@ -691,7 +691,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
else {
dprintk
("%s: invalid state: first byte is %x\n",
__FUNCTION__,
__func__,
ttusb->muxpack[0]);
ttusb->mux_state = 0;
}
Expand Down Expand Up @@ -740,7 +740,7 @@ static void ttusb_iso_irq(struct urb *urb)

#if 0
printk("%s: status %d, errcount == %d, length == %i\n",
__FUNCTION__,
__func__,
urb->status, urb->error_count, urb->actual_length);
#endif

Expand Down Expand Up @@ -833,7 +833,7 @@ static int ttusb_start_iso_xfer(struct ttusb *ttusb)
int i, j, err, buffer_offset = 0;

if (ttusb->iso_streaming) {
printk("%s: iso xfer already running!\n", __FUNCTION__);
printk("%s: iso xfer already running!\n", __func__);
return 0;
}

Expand Down Expand Up @@ -869,7 +869,7 @@ static int ttusb_start_iso_xfer(struct ttusb *ttusb)
ttusb_stop_iso_xfer(ttusb);
printk
("%s: failed urb submission (%i: err = %i)!\n",
__FUNCTION__, i, err);
__func__, i, err);
return err;
}
}
Expand Down Expand Up @@ -1643,7 +1643,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
struct ttusb *ttusb;
int result;

dprintk("%s: TTUSB DVB connected\n", __FUNCTION__);
dprintk("%s: TTUSB DVB connected\n", __func__);

udev = interface_to_usbdev(intf);

Expand Down Expand Up @@ -1773,7 +1773,7 @@ static void ttusb_disconnect(struct usb_interface *intf)

kfree(ttusb);

dprintk("%s: TTUSB DVB disconnected\n", __FUNCTION__);
dprintk("%s: TTUSB DVB disconnected\n", __func__);
}

static struct usb_device_id ttusb_table[] = {
Expand Down

0 comments on commit 6f79ec2

Please sign in to comment.