Commit cc8d9935 authored by Christian Gromm's avatar Christian Gromm Committed by Greg Kroah-Hartman

staging: most: simplify code

This patch simply rearranges code for better readability.
Signed-off-by: default avatarAndrey Shvetsov <andrey.shvetsov@k2l.de>
Signed-off-by: default avatarChristian Gromm <christian.gromm@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ea7e502
...@@ -789,26 +789,24 @@ static int hdm_configure_channel(struct most_interface *iface, int channel, ...@@ -789,26 +789,24 @@ static int hdm_configure_channel(struct most_interface *iface, int channel,
*/ */
static int hdm_update_netinfo(struct most_dev *mdev) static int hdm_update_netinfo(struct most_dev *mdev)
{ {
struct device *dev = &mdev->usb_device->dev; struct usb_device *usb_device = mdev->usb_device;
struct device *dev = &usb_device->dev;
u16 hi, mi, lo, link; u16 hi, mi, lo, link;
if (!is_valid_ether_addr(mdev->hw_addr)) { if (!is_valid_ether_addr(mdev->hw_addr)) {
if (0 > drci_rd_reg(mdev->usb_device, if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_HI, &hi) < 0) {
DRCI_REG_HW_ADDR_HI, &hi)) {
dev_err(dev, "Vendor request \"hw_addr_hi\" failed\n"); dev_err(dev, "Vendor request \"hw_addr_hi\" failed\n");
return -1; return -1;
} }
le16_to_cpus(&hi); le16_to_cpus(&hi);
if (0 > drci_rd_reg(mdev->usb_device, if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_MI, &mi) < 0) {
DRCI_REG_HW_ADDR_MI, &mi)) {
dev_err(dev, "Vendor request \"hw_addr_mid\" failed\n"); dev_err(dev, "Vendor request \"hw_addr_mid\" failed\n");
return -1; return -1;
} }
le16_to_cpus(&mi); le16_to_cpus(&mi);
if (0 > drci_rd_reg(mdev->usb_device, if (drci_rd_reg(usb_device, DRCI_REG_HW_ADDR_LO, &lo) < 0) {
DRCI_REG_HW_ADDR_LO, &lo)) {
dev_err(dev, "Vendor request \"hw_addr_low\" failed\n"); dev_err(dev, "Vendor request \"hw_addr_low\" failed\n");
return -1; return -1;
} }
...@@ -822,13 +820,14 @@ static int hdm_update_netinfo(struct most_dev *mdev) ...@@ -822,13 +820,14 @@ static int hdm_update_netinfo(struct most_dev *mdev)
mdev->hw_addr[4] = lo >> 8; mdev->hw_addr[4] = lo >> 8;
mdev->hw_addr[5] = lo; mdev->hw_addr[5] = lo;
mutex_unlock(&mdev->io_mutex); mutex_unlock(&mdev->io_mutex);
} }
if (0 > drci_rd_reg(mdev->usb_device, DRCI_REG_NI_STATE, &link)) {
if (drci_rd_reg(usb_device, DRCI_REG_NI_STATE, &link) < 0) {
dev_err(dev, "Vendor request \"link status\" failed\n"); dev_err(dev, "Vendor request \"link status\" failed\n");
return -1; return -1;
} }
le16_to_cpus(&link); le16_to_cpus(&link);
mutex_lock(&mdev->io_mutex); mutex_lock(&mdev->io_mutex);
mdev->link_stat = link; mdev->link_stat = link;
mutex_unlock(&mdev->io_mutex); mutex_unlock(&mdev->io_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment