hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: most: replace MOST_CH_ISOC_AVP with MOST_CH_ISOC 

This patch replaces the enum value MOST_CH_ISOC_AVP with the more
appropriate MOST_CH_ISOC.

Signed-off-by: Andrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrey Shvetsov 2016-09-21 14:49:10 +02:00 committed by Greg Kroah-Hartman
parent 95f73013ed
commit 0540609fe2
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/most/aim-v4l2/video.c
View File

@ -505,7 +505,7 @@ static int aim_probe_channel(struct most_interface *iface, int channel_idx,
} }
if (ccfg->data_type != MOST_CH_SYNC && if (ccfg->data_type != MOST_CH_SYNC &&
ccfg->data_type != MOST_CH_ISOC_AVP) { ccfg->data_type != MOST_CH_ISOC) {
pr_err("wrong channel type, expect sync or isoc\n"); pr_err("wrong channel type, expect sync or isoc\n");
return -EINVAL; return -EINVAL;
} }

4
drivers/staging/most/hdm-dim2/dim2_hdm.c
View File

@ -561,7 +561,7 @@ static int configure_channel(struct most_interface *most_iface, int ch_idx,
hal_ret = dim_init_async(&hdm_ch->ch, is_tx, ch_addr, hal_ret = dim_init_async(&hdm_ch->ch, is_tx, ch_addr,
is_tx ? new_size * 2 : new_size); is_tx ? new_size * 2 : new_size);
break; break;
case MOST_CH_ISOC_AVP: case MOST_CH_ISOC:
new_size = dim_norm_isoc_buffer_size(buf_size, sub_size); new_size = dim_norm_isoc_buffer_size(buf_size, sub_size);
if (new_size == 0) { if (new_size == 0) {
pr_err("%s: invalid sub-buffer size or too small buffer size\n", pr_err("%s: invalid sub-buffer size or too small buffer size\n",
@ -797,7 +797,7 @@ static int dim2_probe(struct platform_device *pdev)
cap->name_suffix = hdm_ch->name; cap->name_suffix = hdm_ch->name;
cap->direction = MOST_CH_RX | MOST_CH_TX; cap->direction = MOST_CH_RX | MOST_CH_TX;
cap->data_type = MOST_CH_CONTROL | MOST_CH_ASYNC | cap->data_type = MOST_CH_CONTROL | MOST_CH_ASYNC |
MOST_CH_ISOC_AVP | MOST_CH_SYNC; MOST_CH_ISOC | MOST_CH_SYNC;
cap->num_buffers_packet = MAX_BUFFERS_PACKET; cap->num_buffers_packet = MAX_BUFFERS_PACKET;
cap->buffer_size_packet = MAX_BUF_SIZE_PACKET; cap->buffer_size_packet = MAX_BUF_SIZE_PACKET;
cap->num_buffers_streaming = MAX_BUFFERS_STREAMING; cap->num_buffers_streaming = MAX_BUFFERS_STREAMING;

8
drivers/staging/most/hdm-usb/hdm_usb.c
View File

@ -224,7 +224,7 @@ static unsigned int get_stream_frame_size(struct most_channel_config *cfg)
return frame_size; return frame_size;
} }
switch (cfg->data_type) { switch (cfg->data_type) {
case MOST_CH_ISOC_AVP: case MOST_CH_ISOC:
frame_size = AV_PACKETS_PER_XACT * sub_size; frame_size = AV_PACKETS_PER_XACT * sub_size;
break; break;
case MOST_CH_SYNC: case MOST_CH_SYNC:
@ -634,7 +634,7 @@ static int hdm_enqueue(struct most_interface *iface, int channel,
length, length,
hdm_write_completion, hdm_write_completion,
mbo); mbo);
if (conf->data_type != MOST_CH_ISOC_AVP) if (conf->data_type != MOST_CH_ISOC)
urb->transfer_flags |= URB_ZERO_PACKET; urb->transfer_flags |= URB_ZERO_PACKET;
} else { } else {
usb_fill_bulk_urb(urb, mdev->usb_device, usb_fill_bulk_urb(urb, mdev->usb_device,
@ -698,7 +698,7 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
} }
if (conf->data_type != MOST_CH_SYNC && if (conf->data_type != MOST_CH_SYNC &&
!(conf->data_type == MOST_CH_ISOC_AVP && !(conf->data_type == MOST_CH_ISOC &&
conf->packets_per_xact != 0xFF)) { conf->packets_per_xact != 0xFF)) {
mdev->padding_active[channel] = false; mdev->padding_active[channel] = false;
goto exit; goto exit;
@ -1254,7 +1254,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
tmp_cap->num_buffers_packet = BUF_CHAIN_SIZE; tmp_cap->num_buffers_packet = BUF_CHAIN_SIZE;
tmp_cap->num_buffers_streaming = BUF_CHAIN_SIZE; tmp_cap->num_buffers_streaming = BUF_CHAIN_SIZE;
tmp_cap->data_type = MOST_CH_CONTROL | MOST_CH_ASYNC | tmp_cap->data_type = MOST_CH_CONTROL | MOST_CH_ASYNC |
MOST_CH_ISOC_AVP | MOST_CH_SYNC; MOST_CH_ISOC | MOST_CH_SYNC;
if (usb_endpoint_dir_in(ep_desc)) if (usb_endpoint_dir_in(ep_desc))
tmp_cap->direction = MOST_CH_RX; tmp_cap->direction = MOST_CH_RX;
else else

6
drivers/staging/most/mostcore/core.c
View File

@ -87,8 +87,8 @@ static const struct {
{ MOST_CH_CONTROL, "control\n" }, { MOST_CH_CONTROL, "control\n" },
{ MOST_CH_ASYNC, "async\n" }, { MOST_CH_ASYNC, "async\n" },
{ MOST_CH_SYNC, "sync\n" }, { MOST_CH_SYNC, "sync\n" },
{ MOST_CH_ISOC_AVP, "isoc\n"}, { MOST_CH_ISOC, "isoc\n"},
{ MOST_CH_ISOC_AVP, "isoc_avp\n"}, { MOST_CH_ISOC, "isoc_avp\n"},
}; };
#define to_inst_obj(d) container_of(d, struct most_inst_obj, kobj) #define to_inst_obj(d) container_of(d, struct most_inst_obj, kobj)
@ -284,7 +284,7 @@ static ssize_t show_available_datatypes(struct most_c_obj *c,
strcat(buf, "async "); strcat(buf, "async ");
if (c->iface->channel_vector[i].data_type & MOST_CH_SYNC) if (c->iface->channel_vector[i].data_type & MOST_CH_SYNC)
strcat(buf, "sync "); strcat(buf, "sync ");
if (c->iface->channel_vector[i].data_type & MOST_CH_ISOC_AVP) if (c->iface->channel_vector[i].data_type & MOST_CH_ISOC)
strcat(buf, "isoc "); strcat(buf, "isoc ");
strcat(buf, "\n"); strcat(buf, "\n");
return strlen(buf); return strlen(buf);

2
drivers/staging/most/mostcore/mostcore.h
View File

@ -56,7 +56,7 @@ enum most_channel_direction {
enum most_channel_data_type { enum most_channel_data_type {
MOST_CH_CONTROL = 1 << 0, MOST_CH_CONTROL = 1 << 0,
MOST_CH_ASYNC = 1 << 1, MOST_CH_ASYNC = 1 << 1,
MOST_CH_ISOC_AVP = 1 << 2, MOST_CH_ISOC = 1 << 2,
MOST_CH_SYNC = 1 << 5, MOST_CH_SYNC = 1 << 5,
}; };