Merge tag 'v3.16-rc5' into timers/core

[sfrench/cifs-2.6.git] / drivers / net / irda / via-ircc.c

diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 2900af091c2d5f718bd14a083fb42cf11a72af3b..998bb89ede71c75ea1d67d4c07cbc77963d79c72 100644 (file)
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -510,10 +510,8 @@ static void via_hw_init(struct via_ircc_cb *self)
  */
 static int via_ircc_read_dongle_id(int iobase)
 {
-       int dongle_id = 9;      /* Default to IBM */
-
        IRDA_ERROR("via-ircc: dongle probing not supported, please specify dongle_id module parameter.\n");
-       return dongle_id;
+       return 9;       /* Default to IBM */
 }
 
 /*
@@ -926,7 +924,6 @@ static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase)
 static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
 {
        int iobase;
-       int ret = TRUE;
        u8 Tx_status;
 
        IRDA_DEBUG(3, "%s()\n", __func__);
@@ -983,7 +980,7 @@ F01_E*/
        // Tell the network layer, that we can accept more frames 
        netif_wake_queue(self->netdev);
 //F01   }
-       return ret;
+       return TRUE;
 }
 
 /*