Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/at79', 'spi/topic/bcm...

[sfrench/cifs-2.6.git] / drivers / spi / spi-bcm63xx-hsspi.c

diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index b03fc1850ae98b32dcabd8b574586afa3ef1d525..cbcba614b253375d024cf45f03408fa53337d8f5 100644 (file)
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -108,7 +108,7 @@ struct bcm63xx_hsspi {
        u8 cs_polarity;
 };
 
-static void bcm63xx_hsspi_set_cs(struct bcm63xx_hsspi *bs, unsigned cs,
+static void bcm63xx_hsspi_set_cs(struct bcm63xx_hsspi *bs, unsigned int cs,
                                 bool active)
 {
        u32 reg;
@@ -127,7 +127,7 @@ static void bcm63xx_hsspi_set_cs(struct bcm63xx_hsspi *bs, unsigned cs,
 static void bcm63xx_hsspi_set_clk(struct bcm63xx_hsspi *bs,
                                  struct spi_device *spi, int hz)
 {
-       unsigned profile = spi->chip_select;
+       unsigned int profile = spi->chip_select;
        u32 reg;
 
        reg = DIV_ROUND_UP(2048, DIV_ROUND_UP(bs->speed_hz, hz));
@@ -154,7 +154,7 @@ static void bcm63xx_hsspi_set_clk(struct bcm63xx_hsspi *bs,
 static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t)
 {
        struct bcm63xx_hsspi *bs = spi_master_get_devdata(spi->master);
-       unsigned chip_select = spi->chip_select;
+       unsigned int chip_select = spi->chip_select;
        u16 opcode = 0;
        int pending = t->len;
        int step_size = HSSPI_BUFFER_LEN;