mmc: mmci: Change struct members from bool to u8
authorLudovic Barre <ludovic.barre@st.com>
Tue, 2 Oct 2018 12:09:03 +0000 (14:09 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 8 Oct 2018 09:40:43 +0000 (11:40 +0200)
Recent versions of checkpatch have a new warning based on a documented
preference of Linus to not use bool in structures due to wasted space and
the size of bool is implementation dependent.  For more information, see
the email thread at https://lkml.org/lkml/2017/11/21/384

fix checkpatch --strict issues:
-CHECK: Avoid using bool structure members because of possible alignment
 issues - see: https://lkml.org/lkml/2017/11/21/384
-WARNING: Avoid using bool as bitfield. Prefer bool bitfields as
 unsigned int or u<8|16|32>

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mmci.h

index 21aaf9a..01e6c6b 100644 (file)
@@ -248,24 +248,24 @@ struct variant_data {
        unsigned int            data_cmd_enable;
        unsigned int            datactrl_mask_ddrmode;
        unsigned int            datactrl_mask_sdio;
-       bool                    st_sdio;
-       bool                    st_clkdiv;
-       bool                    blksz_datactrl16;
-       bool                    blksz_datactrl4;
+       u8                      st_sdio:1;
+       u8                      st_clkdiv:1;
+       u8                      blksz_datactrl16:1;
+       u8                      blksz_datactrl4:1;
        u32                     pwrreg_powerup;
        u32                     f_max;
-       bool                    signal_direction;
-       bool                    pwrreg_clkgate;
-       bool                    busy_detect;
+       u8                      signal_direction:1;
+       u8                      pwrreg_clkgate:1;
+       u8                      busy_detect:1;
        u32                     busy_dpsm_flag;
        u32                     busy_detect_flag;
        u32                     busy_detect_mask;
-       bool                    pwrreg_nopower;
-       bool                    explicit_mclk_control;
-       bool                    qcom_fifo;
-       bool                    qcom_dml;
-       bool                    reversed_irq_handling;
-       bool                    mmcimask1;
+       u8                      pwrreg_nopower:1;
+       u8                      explicit_mclk_control:1;
+       u8                      qcom_fifo:1;
+       u8                      qcom_dml:1;
+       u8                      reversed_irq_handling:1;
+       u8                      mmcimask1:1;
        u32                     start_err;
        u32                     opendrain;
        void (*init)(struct mmci_host *host);
@@ -290,7 +290,7 @@ struct mmci_host {
        struct mmc_data         *data;
        struct mmc_host         *mmc;
        struct clk              *clk;
-       bool                    singleirq;
+       u8                      singleirq:1;
 
        spinlock_t              lock;
 
@@ -304,7 +304,7 @@ struct mmci_host {
        u32                     datactrl_reg;
        u32                     busy_status;
        u32                     mask1_reg;
-       bool                    vqmmc_enabled;
+       u8                      vqmmc_enabled:1;
        struct mmci_platform_data *plat;
        struct mmci_host_ops    *ops;
        struct variant_data     *variant;
@@ -330,7 +330,7 @@ struct mmci_host {
        struct dma_chan         *dma_tx_channel;
        struct dma_async_tx_descriptor  *dma_desc_current;
        struct mmci_host_next   next_data;
-       bool                    dma_in_progress;
+       u8                      dma_in_progress:1;
 
 #define dma_inprogress(host)   ((host)->dma_in_progress)
 #endif