4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 808939b9f8fb..0b769192d4ce 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -464,7 +464,7 @@ static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)
         }
 
         fcs = ~(crc32_le(~0, buf, new_len));
-        if(fcs != le32_to_cpu(get_unaligned((u32 *)(buf+new_len)))) {
+        if(fcs != le32_to_cpu(get_unaligned((__le32 *)(buf+new_len)))) {
                 IRDA_ERROR("crc error calc 0x%x len %d\n", fcs, new_len);
                 mcs->stats.rx_errors++;
                 mcs->stats.rx_crc_errors++;
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index bbe4e094c424..6078e03de9a8 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -414,7 +414,7 @@ EXPORT_SYMBOL(sirdev_raw_read);
 int sirdev_set_dtr_rts(struct sir_dev *dev, int dtr, int rts)
 {
         int ret = -ENXIO;
-        if (dev->drv->set_dtr_rts != 0)
+        if (dev->drv->set_dtr_rts)
                 ret =  dev->drv->set_dtr_rts(dev, dtr, rts);
         return ret;
 }
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 1afaee0fa7e0..042bc2f0417d 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -332,7 +332,7 @@ static void fir_eof(struct stir_cb *stir)
         }
 
         fcs = ~(crc32_le(~0, rx_buff->data, len));
-        if (fcs != le32_to_cpu(get_unaligned((u32 *)(rx_buff->data+len)))) {
+        if (fcs != le32_to_cpu(get_unaligned((__le32 *)(rx_buff->data+len)))) {
                 pr_debug("crc error calc 0x%x len %d\n", fcs, len);
                 stir->stats.rx_errors++;
                 stir->stats.rx_crc_errors++;
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index ca12a6096419..c8b9c74eea52 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -537,10 +537,10 @@ calc_width_bits(unsigned baudrate, unsigned widthselect, unsigned clockselect)
  */
 
 struct ring_descr_hw {
-        volatile u16    rd_count;       /* tx/rx count [11:0] */
-        u16             reserved;
+        volatile __le16 rd_count;       /* tx/rx count [11:0] */
+        __le16          reserved;
         union {
-                u32     addr;           /* [23:0] of the buffer's busaddress */
+                __le32  addr;           /* [23:0] of the buffer's busaddress */
                 struct {
                         u8              addr_res[3];
                         volatile u8     status;         /* descriptor status */