summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-03-04 10:10:44 +0800
committerYe Li <ye.li@nxp.com>2016-03-04 16:09:02 +0800
commit13d2079a2d74797fe665ccf94109b06aaccf1b45 (patch)
treea296191383df38334b9d04414bca16c8138e0a6b /drivers
parent8c8da023f9c530254486cda4bccb3a45d0ae6e28 (diff)
downloadu-boot-imx-13d2079a2d74797fe665ccf94109b06aaccf1b45.zip
u-boot-imx-13d2079a2d74797fe665ccf94109b06aaccf1b45.tar.gz
u-boot-imx-13d2079a2d74797fe665ccf94109b06aaccf1b45.tar.bz2
MLK-12492-1 mx6: fix type style problems introduced by patch MLK-12483
Some type style problems found by review-commits for previous patch MLK-12483, fix them in this patch and re-check. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 8ada91778f7f28dd33b80f515a35d09c1398933c)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/apbh_dma.c5
-rw-r--r--drivers/i2c/mxc_i2c.c4
-rw-r--r--drivers/spi/mxc_spi.c2
-rw-r--r--drivers/usb/host/ehci-mx6.c4
-rw-r--r--drivers/video/mxsfb.c3
5 files changed, 9 insertions, 9 deletions
diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c
index d5c9a7f..a755dee 100644
--- a/drivers/dma/apbh_dma.c
+++ b/drivers/dma/apbh_dma.c
@@ -128,7 +128,7 @@ static int mxs_dma_enable(int channel)
if (list_empty(&pchan->active))
return -EFAULT;
-
+
pdesc = list_first_entry(&pchan->active, struct mxs_dma_desc, node);
if (pchan->flags & MXS_DMA_FLAGS_BUSY) {
if (!(pdesc->cmd.data & MXS_DMA_DESC_CHAIN))
@@ -576,7 +576,8 @@ void mxs_dma_init(void)
#ifdef CONFIG_MX6
if (check_module_fused(MX6_MODULE_APBHDMA)) {
- printf("NAND APBH-DMA@0x%x is fused, disable it\n", MXS_APBH_BASE);
+ printf("NAND APBH-DMA@0x%x is fused, disable it\n",
+ MXS_APBH_BASE);
return;
}
#endif
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index b77caac..3fb89d1 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -526,10 +526,10 @@ void bus_i2c_init(void *base, int speed, int unused,
struct i2c_parms *p = srdata->i2c_data;
if (!base)
return;
-
+
#ifdef CONFIG_MX6
if (mx6_i2c_fused((u32)base)) {
- printf("I2C@0x%x is fused, disable it\n",
+ printf("I2C@0x%x is fused, disable it\n",
(u32)base);
return;
}
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index c061145..7d84865 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -414,7 +414,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
return NULL;
}
- if (mx6_ecspi_fused(spi_bases[bus])){
+ if (mx6_ecspi_fused(spi_bases[bus])) {
printf("ECSPI@0x%lx is fused, disable it\n", spi_bases[bus]);
return NULL;
}
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 3ec16ec..7fa8b22 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -237,11 +237,11 @@ int ehci_hcd_init(int index, enum usb_init_type init,
return -EINVAL;
if (mx6_usb_fused(USB_BASE_ADDR + (0x200 * index))) {
- printf("USB@0x%x is fused, disable it\n",
+ printf("USB@0x%x is fused, disable it\n",
USB_BASE_ADDR + (0x200 * index));
return -2;
}
-
+
enable_usboh3_clk(1);
mdelay(1);
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 270a31a..05e5fbb 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -171,9 +171,8 @@ void lcdif_power_down()
int timeout = WAIT_FOR_VSYNC_TIMEOUT;
#ifdef CONFIG_MX6
- if (check_module_fused(MX6_MODULE_LCDIF)) {
+ if (check_module_fused(MX6_MODULE_LCDIF))
return;
- }
#endif
writel(panel.frameAdrs, &regs->hw_lcdif_cur_buf);
writel(panel.frameAdrs, &regs->hw_lcdif_next_buf);