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

Staging: slicoss: Refactor code by introducing new function slic_interrupt_card_up() 

This patch fixes the following checkpatch.pl warning in slicoss.c:
WARNING: Too many leading tabs - consider code refactoring

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rashika Kheria 2013-10-19 13:17:10 +05:30 committed by Greg Kroah-Hartman
parent 1f6876cf9f
commit f66626e436
1 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/staging/slicoss/slicoss.c
View File

@ -2619,20 +2619,9 @@ static void slic_xmit_complete(struct adapter *adapter)
adapter->max_isr_xmits = max(adapter->max_isr_xmits, frames); adapter->max_isr_xmits = max(adapter->max_isr_xmits, frames);
} }
static irqreturn_t slic_interrupt(int irq, void *dev_id) static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,
struct net_device *dev)
{ {
struct net_device *dev = (struct net_device *)dev_id;
struct adapter *adapter = netdev_priv(dev);
u32 isr;
if ((adapter->pshmem) && (adapter->pshmem->isr)) {
slic_reg32_write(&adapter->slic_regs->slic_icr,
ICR_INT_MASK, FLUSH);
isr = adapter->isrcopy = adapter->pshmem->isr;
adapter->pshmem->isr = 0;
adapter->num_isrs++;
switch (adapter->card->state) {
case CARD_UP:
if (isr & ~ISR_IO) { if (isr & ~ISR_IO) {
if (isr & ISR_ERR) { if (isr & ISR_ERR) {
adapter->error_interrupts++; adapter->error_interrupts++;
@ -2644,18 +2633,15 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
struct slic_rcvqueue *rcvq = struct slic_rcvqueue *rcvq =
&adapter->rcvqueue; &adapter->rcvqueue;
adapter-> adapter->error_rmiss_interrupts++;
error_rmiss_interrupts++;
if (!rcvq->errors) if (!rcvq->errors)
rcv_count = rcvq->count; rcv_count = rcvq->count;
pre_count = rcvq->count; pre_count = rcvq->count;
errors = rcvq->errors; errors = rcvq->errors;
while (rcvq->count < while (rcvq->count < SLIC_RCVQ_FILLTHRESH) {
SLIC_RCVQ_FILLTHRESH) { count = slic_rcvqueue_fill(adapter);
count =
slic_rcvqueue_fill
(adapter);
if (!count) if (!count)
break; break;
} }
@ -2675,8 +2661,8 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
slic_link_event_handler(adapter); slic_link_event_handler(adapter);
} }
if ((isr & ISR_UPC) || if ((isr & ISR_UPC) || (isr & ISR_UPCERR) ||
(isr & ISR_UPCERR) || (isr & ISR_UPCBSY)) { (isr & ISR_UPCBSY)) {
adapter->upr_interrupts++; adapter->upr_interrupts++;
slic_upr_request_complete(adapter, isr); slic_upr_request_complete(adapter, isr);
} }
@ -2691,6 +2677,24 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
adapter->xmit_interrupts++; adapter->xmit_interrupts++;
slic_xmit_complete(adapter); slic_xmit_complete(adapter);
} }
}
static irqreturn_t slic_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct adapter *adapter = netdev_priv(dev);
u32 isr;
if ((adapter->pshmem) && (adapter->pshmem->isr)) {
slic_reg32_write(&adapter->slic_regs->slic_icr,
ICR_INT_MASK, FLUSH);
isr = adapter->isrcopy = adapter->pshmem->isr;
adapter->pshmem->isr = 0;
adapter->num_isrs++;
switch (adapter->card->state) {
case CARD_UP:
slic_interrupt_card_up(isr, adapter, dev);
break; break;
case CARD_DOWN: case CARD_DOWN: