diff --git a/platform/msb430/dev/cc1020.c b/platform/msb430/dev/cc1020.c
index affeee914..51d5788b9 100644
--- a/platform/msb430/dev/cc1020.c
+++ b/platform/msb430/dev/cc1020.c
@@ -203,7 +203,7 @@ cc1020_sending(void)
 }
 
 int
-cc1020_send(const void *buf, unsigned len)
+cc1020_send(const void *buf, unsigned short len)
 {
   if (cc1020_state == CC1020_OFF)
     return -2;
@@ -235,7 +235,7 @@ cc1020_send(const void *buf, unsigned len)
 }
 
 int
-cc1020_read(void *buf, unsigned size)
+cc1020_read(void *buf, unsigned short size)
 {
   unsigned len;
 
@@ -299,8 +299,6 @@ cc1020_get_rssi(void)
 int
 cc1020_carrier_sense(void)
 {
-  int carrier_sense;
-
   return !!(cc1020_read_reg(CC1020_STATUS) & CARRIER_SENSE);
 }
 
diff --git a/platform/msb430/dev/cc1020.h b/platform/msb430/dev/cc1020.h
index 98bc75756..2972e65cf 100644
--- a/platform/msb430/dev/cc1020.h
+++ b/platform/msb430/dev/cc1020.h
@@ -62,8 +62,8 @@ int cc1020_carrier_sense(void);
 uint8_t cc1020_get_rssi(void);
 int cc1020_sending(void);
 
-int cc1020_send(const void *buf, unsigned size);
-int cc1020_read(void *buf, unsigned size);
+int cc1020_send(const void *buf, unsigned short size);
+int cc1020_read(void *buf, unsigned short size);
 void cc1020_set_receiver(void (*recv)(const struct radio_driver *));
 int cc1020_on(void);
 int cc1020_off(void);