mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 01:10:04 +00:00
Code Issues Releases Wiki Activity

staging: most: hdm-usb: introduce synchronization function

Browse source 
This patch introduces the function start_sync_ep() and relocates the
triggers for synchronization to this function.

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-10-25 17:44:21 +02:00 committed by Greg Kroah-Hartman
parent 7c23baa90d
commit e33269f60a
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/staging/most/hdm-usb/hdm_usb.c
View file

@ -182,6 +182,11 @@ static inline int drci_wr_reg(struct usb_device *dev, u16 reg, u16 data)
5 * HZ);
}
static inline int start_sync_ep(struct usb_device *usb_dev, u16 ep)
{
return drci_wr_reg(usb_dev, DRCI_REG_BASE + DRCI_COMMAND + ep * 16, 1);
}
/**
* get_stream_frame_size - calculate frame size of current configuration
* @cfg: channel configuration
@ -697,11 +702,8 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
mdev->conf[channel] = *conf;
if (conf->data_type == MOST_CH_ASYNC) {
u16 ep = mdev->ep_address[channel];
int err = drci_wr_reg(mdev->usb_device,
DRCI_REG_BASE + DRCI_COMMAND + ep * 16,
1);
if (err < 0)
if (start_sync_ep(mdev->usb_device, ep) < 0)
dev_warn(dev, "sync for ep%02x failed", ep);
}
return 0;
@ -987,6 +989,7 @@ static ssize_t store_value(struct most_dci_obj *dci_obj,
u16 val;
u16 reg_addr;
const char *name = attr->attr.name;
struct usb_device *usb_dev = dci_obj->usb_device;
int err = kstrtou16(buf, 16, &val);
if (err)
@ -997,18 +1000,15 @@ static ssize_t store_value(struct most_dci_obj *dci_obj,
return count;
}
if (!strcmp(name, "arb_value")) {
reg_addr = dci_obj->reg_addr;
} else if (!strcmp(name, "sync_ep")) {
u16 ep = val;
reg_addr = DRCI_REG_BASE + DRCI_COMMAND + ep * 16;
val = 1;
} else if (get_static_reg_addr(ro_regs, name, &reg_addr)) {
if (!strcmp(name, "arb_value"))
err = drci_wr_reg(usb_dev, dci_obj->reg_addr, val);
else if (!strcmp(name, "sync_ep"))
err = start_sync_ep(usb_dev, val);
else if (!get_static_reg_addr(ro_regs, name, &reg_addr))
err = drci_wr_reg(usb_dev, reg_addr, val);
else
return -EFAULT;
}
err = drci_wr_reg(dci_obj->usb_device, reg_addr, val);
if (err < 0)
return err;