style: format SDIO changes for current master

Author: GuEe-GUI

components/drivers/include/drivers/dev_sdhci.h

@@ -424,15 +424,15 @@ struct rt_sdhci_host
     char        *bounce_buffer;                         /* For packing SDMA reads/writes */
     rt_uint64_t  bounce_addr;
     unsigned int bounce_buffer_size;
-    void        *bounce_orig_buf;
-    rt_bool_t    bounce_active;
+    void *bounce_orig_buf;
+    rt_bool_t bounce_active;
 
     const struct rt_sdhci_ops *ops;                     /* Low level hw interface */
 
     /* Internal data */
-    struct rt_mmc_host    *mmc;                       /* MMC structure */
+    struct rt_mmc_host *mmc;                       /* MMC structure */
     struct rt_mmc_host_ops mmc_host_ops;               /* MMC host ops */
-    rt_uint64_t            dma_mask;                   /* custom DMA mask */
+    rt_uint64_t dma_mask;                   /* custom DMA mask */
 
     rt_spinlock_t lock;
     int           flags;                                /* Host attributes */
@@ -478,15 +478,15 @@ struct rt_sdhci_host
     unsigned int          data_early : 1;               /* Data finished before cmd */
 
     unsigned int blocks;                                /* remaining PIO blocks */
-    rt_size_t    align_buffer_sz;                          /* Bounce buffer size */
-    rt_uint64_t  align_addr;                             /* Mapped bounce buffer */
+    rt_size_t align_buffer_sz;                          /* Bounce buffer size */
+    rt_uint64_t align_addr;                             /* Mapped bounce buffer */
 
     struct rt_workqueue *complete_wq;                   /* Request completion wq */
     struct rt_work       complete_work;                 /* Request completion work */
 
     struct rt_workqueue *irq_wq;
     struct rt_work       irq_work;
-    struct rt_work       poll_work;
+    struct rt_work poll_work;
 
     struct rt_timer timer;                              /* Timer for timeouts */
     struct rt_timer data_timer;                         /* Timer for data timeouts */
@@ -521,8 +521,8 @@ struct rt_sdhci_host
 #define RT_SDHCI_TUNING_MODE_2 1
 #define RT_SDHCI_TUNING_MODE_3 2
 
-    int         tuning_delay;
-    int         tuning_loop_count;
+    int tuning_delay;
+    int tuning_loop_count;
     rt_uint32_t sdma_boundary;
     rt_uint64_t data_timeout;
 
@@ -531,31 +531,31 @@ struct rt_sdhci_host
 
 struct rt_sdhci_ops
 {
-    rt_uint32_t  (*read_l)(struct rt_sdhci_host *host, int reg);
-    rt_uint16_t  (*read_w)(struct rt_sdhci_host *host, int reg);
-    rt_uint8_t   (*read_b)(struct rt_sdhci_host *host, int reg);
-    void         (*write_l)(struct rt_sdhci_host *host, rt_uint32_t val, int reg);
-    void         (*write_w)(struct rt_sdhci_host *host, rt_uint16_t val, int reg);
-    void         (*write_b)(struct rt_sdhci_host *host, rt_uint8_t val, int reg);
-    void         (*set_clock)(struct rt_sdhci_host *host, unsigned int clock);
-    void         (*set_power)(struct rt_sdhci_host *host, unsigned char mode, unsigned short vdd);
-    rt_uint32_t  (*irq)(struct rt_sdhci_host *host, rt_uint32_t intmask);
-    int          (*set_dma_mask)(struct rt_sdhci_host *host);
-    int          (*enable_dma)(struct rt_sdhci_host *host);
+    rt_uint32_t (*read_l)(struct rt_sdhci_host *host, int reg);
+    rt_uint16_t (*read_w)(struct rt_sdhci_host *host, int reg);
+    rt_uint8_t (*read_b)(struct rt_sdhci_host *host, int reg);
+    void (*write_l)(struct rt_sdhci_host *host, rt_uint32_t val, int reg);
+    void (*write_w)(struct rt_sdhci_host *host, rt_uint16_t val, int reg);
+    void (*write_b)(struct rt_sdhci_host *host, rt_uint8_t val, int reg);
+    void (*set_clock)(struct rt_sdhci_host *host, unsigned int clock);
+    void (*set_power)(struct rt_sdhci_host *host, unsigned char mode, unsigned short vdd);
+    rt_uint32_t (*irq)(struct rt_sdhci_host *host, rt_uint32_t intmask);
+    int (*set_dma_mask)(struct rt_sdhci_host *host);
+    int (*enable_dma)(struct rt_sdhci_host *host);
     unsigned int (*get_max_clock)(struct rt_sdhci_host *host);
     unsigned int (*get_min_clock)(struct rt_sdhci_host *host);
     unsigned int (*get_timeout_clock)(struct rt_sdhci_host *host);
     unsigned int (*get_max_timeout_count)(struct rt_sdhci_host *host);
-    void         (*set_timeout)(struct rt_sdhci_host *host, struct rt_mmcsd_cmd *cmd);
-    void         (*set_bus_width)(struct rt_sdhci_host *host, int width);
+    void (*set_timeout)(struct rt_sdhci_host *host, struct rt_mmcsd_cmd *cmd);
+    void (*set_bus_width)(struct rt_sdhci_host *host, int width);
     unsigned int (*get_ro)(struct rt_sdhci_host *host);
-    void         (*reset)(struct rt_sdhci_host *host, rt_uint8_t mask);
-    int          (*platform_execute_tuning)(struct rt_sdhci_host *host, rt_uint32_t opcode);
-    void         (*set_uhs_signaling)(struct rt_sdhci_host *host, unsigned int uhs);
-    void         (*hw_reset)(struct rt_sdhci_host *host);
-    void         (*card_event)(struct rt_sdhci_host *host);
-    void         (*voltage_switch)(struct rt_sdhci_host *host);
-    void         (*request_done)(struct rt_sdhci_host *host, struct rt_mmcsd_req *mrq);
+    void (*reset)(struct rt_sdhci_host *host, rt_uint8_t mask);
+    int (*platform_execute_tuning)(struct rt_sdhci_host *host, rt_uint32_t opcode);
+    void (*set_uhs_signaling)(struct rt_sdhci_host *host, unsigned int uhs);
+    void (*hw_reset)(struct rt_sdhci_host *host);
+    void (*card_event)(struct rt_sdhci_host *host);
+    void (*voltage_switch)(struct rt_sdhci_host *host);
+    void (*request_done)(struct rt_sdhci_host *host, struct rt_mmcsd_req *mrq);
 };
 
 rt_inline void rt_sdhci_writel(struct rt_sdhci_host *host, rt_uint32_t val, int reg)

components/drivers/sdio/dev_regulator.c

@@ -141,11 +141,11 @@ static int regulator_set_voltage_if_supported(struct rt_regulator *regulator,
     return -RT_EINVAL;
 }
 
-rt_err_t sdio_regulator_set_vqmmc(struct rt_mmcsd_host   *host,
+rt_err_t sdio_regulator_set_vqmmc(struct rt_mmcsd_host *host,
                                   struct rt_mmcsd_io_cfg *ios)
 {
     rt_err_t err;
-    int      uvolt, min_uvolt, max_uvolt;
+    int uvolt, min_uvolt, max_uvolt;
 
     if (rt_is_err_or_null(host->supply.vqmmc))
     {
@@ -197,7 +197,7 @@ rt_err_t sdio_regulator_get_supply(struct rt_device *dev, struct rt_mmcsd_host *
         return -RT_EINVAL;
     }
 
-    host->supply.vmmc  = rt_regulator_get(dev, "vmmc");
+    host->supply.vmmc = rt_regulator_get(dev, "vmmc");
     host->supply.vqmmc = rt_regulator_get(dev, "vqmmc");
 
     if (!rt_is_err(host->supply.vmmc))