Merge git://www.denx.de/git/u-boot

[u-boot] / drivers / ds1722.c

diff --git a/drivers/ds1722.c b/drivers/ds1722.c
index 34eb80ca23a5024a306009ea3cf29b0171c2052d..227d8169a5b36b0773f7ac1c3ddb1a1ca110ca87 100644 (file)
--- a/drivers/ds1722.c
+++ b/drivers/ds1722.c
@@ -18,24 +18,24 @@ static void ds1722_select(int dev)
 u8 ds1722_read(int dev, int addr)
 {
        u8 res;
-       
+
        ds1722_select(dev);
-       
-       ssi_tx_byte(addr);      
-       res = ssi_rx_byte();    
-       
+
+       ssi_tx_byte(addr);
+       res = ssi_rx_byte();
+
        ssi_chip_select(0);
-       
+
        return res;
 }
 
 void ds1722_write(int dev, int addr, u8 data)
 {
        ds1722_select(dev);
-       
-       ssi_tx_byte(0x80|addr); 
-       ssi_tx_byte(data);      
-       
+
+       ssi_tx_byte(0x80|addr);
+       ssi_tx_byte(data);
+
        ssi_chip_select(0);
 }
 
@@ -43,26 +43,26 @@ void ds1722_write(int dev, int addr, u8 data)
 u16 ds1722_temp(int dev, int resolution)
 {
        static int useconds[] = {
-               75000, 150000, 300000, 600000, 1200000 
+               75000, 150000, 300000, 600000, 1200000
        };
        char temp;
        u16 res;
-       
-       
+
+
        /* set up the desired resulotion ... */
        ds1722_write(dev, 0, 0xe0 | (resolution << 1));
-                       
+
        /* wait while the chip measures the tremperature */
-       udelay(useconds[resolution]);   
-       
+       udelay(useconds[resolution]);
+
        res = (temp = ds1722_read(dev, 2)) << 8;
-       
-       if (temp < 0) { 
+
+       if (temp < 0) {
                temp = (16 - (ds1722_read(dev, 1) >> 4)) & 0x0f;
        } else {
                temp = (ds1722_read(dev, 1) >> 4);
        }
-       
+
        switch (temp) {
        case 0:
                /* .0000 */
@@ -129,7 +129,7 @@ u16 ds1722_temp(int dev, int resolution)
                break;
        }
        return res;
-                       
+
 }
 
 int ds1722_probe(int dev)