Merge tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / kpc2000 / kpc_spi / spi_driver.c

diff --git a/drivers/staging/kpc2000/kpc_spi/spi_driver.c b/drivers/staging/kpc2000/kpc_spi/spi_driver.c
index 3ace4e5c12847ef270f6a279dd7ff8392688bd6b..86df16547a92ccb6b492ec765acace194f5ea84a 100644 (file)
--- a/drivers/staging/kpc2000/kpc_spi/spi_driver.c
+++ b/drivers/staging/kpc2000/kpc_spi/spi_driver.c
@@ -83,18 +83,18 @@ struct kp_spi_controller_state {
 union kp_spi_config {
     /* use this to access individual elements */
     struct __attribute__((packed)) spi_config_bitfield {
-        unsigned char pha       : 1; /* spim_clk Phase      */
-        unsigned char pol       : 1; /* spim_clk Polarity   */
-        unsigned char epol      : 1; /* spim_csx Polarity   */
-        unsigned char dpe       : 1; /* Transmission Enable */
-        unsigned char wl        : 5; /* Word Length         */
-        unsigned char           : 3;
-        unsigned char trm       : 2; /* TxRx Mode           */
-        unsigned char cs        : 4; /* Chip Select         */
-        unsigned char wcnt      : 7; /* Word Count          */
-        unsigned char ffen      : 1; /* FIFO Enable         */
-        unsigned char spi_en    : 1; /* SPI Enable          */
-        unsigned char           : 5;
+        unsigned int pha       : 1; /* spim_clk Phase      */
+        unsigned int pol       : 1; /* spim_clk Polarity   */
+        unsigned int epol      : 1; /* spim_csx Polarity   */
+        unsigned int dpe       : 1; /* Transmission Enable */
+        unsigned int wl        : 5; /* Word Length         */
+        unsigned int           : 3;
+        unsigned int trm       : 2; /* TxRx Mode           */
+        unsigned int cs        : 4; /* Chip Select         */
+        unsigned int wcnt      : 7; /* Word Count          */
+        unsigned int ffen      : 1; /* FIFO Enable         */
+        unsigned int spi_en    : 1; /* SPI Enable          */
+        unsigned int           : 5;
     } bitfield;
     /* use this to grab the whole register */
     u32 reg;
@@ -104,15 +104,15 @@ union kp_spi_config {
 
 union kp_spi_status {
     struct __attribute__((packed)) spi_status_bitfield {
-        unsigned char rx    :  1; /* Rx Status       */
-        unsigned char tx    :  1; /* Tx Status       */
-        unsigned char eo    :  1; /* End of Transfer */
-        unsigned char       :  1;
-        unsigned char txffe :  1; /* Tx FIFO Empty   */
-        unsigned char txfff :  1; /* Tx FIFO Full    */
-        unsigned char rxffe :  1; /* Rx FIFO Empty   */
-        unsigned char rxfff :  1; /* Rx FIFO Full    */
-        unsigned int        : 24;
+        unsigned int rx    :  1; /* Rx Status       */
+        unsigned int tx    :  1; /* Tx Status       */
+        unsigned int eo    :  1; /* End of Transfer */
+        unsigned int       :  1;
+        unsigned int txffe :  1; /* Tx FIFO Empty   */
+        unsigned int txfff :  1; /* Tx FIFO Full    */
+        unsigned int rxffe :  1; /* Rx FIFO Empty   */
+        unsigned int rxfff :  1; /* Rx FIFO Full    */
+        unsigned int       : 24;
     } bitfield;
     u32 reg;
 };
@@ -121,8 +121,8 @@ union kp_spi_status {
 
 union kp_spi_ffctrl {
     struct __attribute__((packed)) spi_ffctrl_bitfield {
-        unsigned char ffstart :  1; /* FIFO Start */
-        unsigned int          : 31;
+        unsigned int ffstart :  1; /* FIFO Start */
+        unsigned int         : 31;
     } bitfield;
     u32 reg;
 };