diff options
Diffstat (limited to 'drivers/s390/net/lcs.c')
-rw-r--r-- | drivers/s390/net/lcs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index c915bb5d5a93..f94419b334f7 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1290,7 +1290,7 @@ lcs_set_multicast_list(struct net_device *dev) | |||
1290 | LCS_DBF_TEXT(4, trace, "setmulti"); | 1290 | LCS_DBF_TEXT(4, trace, "setmulti"); |
1291 | card = (struct lcs_card *) dev->priv; | 1291 | card = (struct lcs_card *) dev->priv; |
1292 | 1292 | ||
1293 | if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) | 1293 | if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) |
1294 | schedule_work(&card->kernel_thread_starter); | 1294 | schedule_work(&card->kernel_thread_starter); |
1295 | } | 1295 | } |
1296 | 1296 | ||
@@ -1399,7 +1399,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1399 | /* Check for channel and device errors presented */ | 1399 | /* Check for channel and device errors presented */ |
1400 | rc = lcs_get_problem(cdev, irb); | 1400 | rc = lcs_get_problem(cdev, irb); |
1401 | if (rc || (dstat & DEV_STAT_UNIT_EXCEP)) { | 1401 | if (rc || (dstat & DEV_STAT_UNIT_EXCEP)) { |
1402 | PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n", | 1402 | PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n", |
1403 | cdev->dev.bus_id, dstat, cstat); | 1403 | cdev->dev.bus_id, dstat, cstat); |
1404 | if (rc) { | 1404 | if (rc) { |
1405 | lcs_schedule_recovery(card); | 1405 | lcs_schedule_recovery(card); |
@@ -1410,7 +1410,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1410 | /* How far in the ccw chain have we processed? */ | 1410 | /* How far in the ccw chain have we processed? */ |
1411 | if ((channel->state != CH_STATE_INIT) && | 1411 | if ((channel->state != CH_STATE_INIT) && |
1412 | (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) { | 1412 | (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) { |
1413 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cpa) | 1413 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cpa) |
1414 | - channel->ccws; | 1414 | - channel->ccws; |
1415 | if ((irb->scsw.actl & SCSW_ACTL_SUSPENDED) || | 1415 | if ((irb->scsw.actl & SCSW_ACTL_SUSPENDED) || |
1416 | (irb->scsw.cstat & SCHN_STAT_PCI)) | 1416 | (irb->scsw.cstat & SCHN_STAT_PCI)) |
@@ -1733,7 +1733,7 @@ lcs_start_kernel_thread(struct lcs_card *card) | |||
1733 | kernel_thread(lcs_recovery, (void *) card, SIGCHLD); | 1733 | kernel_thread(lcs_recovery, (void *) card, SIGCHLD); |
1734 | #ifdef CONFIG_IP_MULTICAST | 1734 | #ifdef CONFIG_IP_MULTICAST |
1735 | if (lcs_do_start_thread(card, LCS_SET_MC_THREAD)) | 1735 | if (lcs_do_start_thread(card, LCS_SET_MC_THREAD)) |
1736 | kernel_thread(lcs_register_mc_addresses, | 1736 | kernel_thread(lcs_register_mc_addresses, |
1737 | (void *) card, SIGCHLD); | 1737 | (void *) card, SIGCHLD); |
1738 | #endif | 1738 | #endif |
1739 | } | 1739 | } |
@@ -1994,7 +1994,7 @@ lcs_timeout_store (struct device *dev, struct device_attribute *attr, const char | |||
1994 | DEVICE_ATTR(lancmd_timeout, 0644, lcs_timeout_show, lcs_timeout_store); | 1994 | DEVICE_ATTR(lancmd_timeout, 0644, lcs_timeout_show, lcs_timeout_store); |
1995 | 1995 | ||
1996 | static ssize_t | 1996 | static ssize_t |
1997 | lcs_dev_recover_store(struct device *dev, struct device_attribute *attr, | 1997 | lcs_dev_recover_store(struct device *dev, struct device_attribute *attr, |
1998 | const char *buf, size_t count) | 1998 | const char *buf, size_t count) |
1999 | { | 1999 | { |
2000 | struct lcs_card *card = dev->driver_data; | 2000 | struct lcs_card *card = dev->driver_data; |