arm: imx6: defconfig: update tx6 defconfigs

[karo-tx-linux.git] / drivers / spi / spi-butterfly.c

diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c
index b1ecea2d76b38bac03541a15a22d39a0ad3d12ff..8081f96bd1d5add797eb482446f55850cbc248f1 100644 (file)
--- a/drivers/spi/spi-butterfly.c
+++ b/drivers/spi/spi-butterfly.c
@@ -147,8 +147,8 @@ static void butterfly_chipselect(struct spi_device *spi, int value)
 
 /* we only needed to implement one mode here, and choose SPI_MODE_0 */
 
-#define        spidelay(X)     do{}while(0)
-//#define      spidelay        ndelay
+#define spidelay(X)    do { } while (0)
+/* #define spidelay    ndelay */
 
 #include "spi-bitbang-txrx.h"
 
@@ -171,15 +171,15 @@ static struct mtd_partition partitions[] = { {
        /* sector 0 = 8 pages * 264 bytes/page (1 block)
         * sector 1 = 248 pages * 264 bytes/page
         */
-       .name           = "bookkeeping",        // 66 KB
+       .name           = "bookkeeping",        /* 66 KB */
        .offset         = 0,
        .size           = (8 + 248) * 264,
-//     .mask_flags     = MTD_WRITEABLE,
+       /* .mask_flags  = MTD_WRITEABLE, */
 }, {
        /* sector 2 = 256 pages * 264 bytes/page
         * sectors 3-5 = 512 pages * 264 bytes/page
         */
-       .name           = "filesystem",         // 462 KB
+       .name           = "filesystem",         /* 462 KB */
        .offset         = MTDPART_OFS_APPEND,
        .size           = MTDPART_SIZ_FULL,
 } };
@@ -209,7 +209,7 @@ static void butterfly_attach(struct parport *p)
         * and no way to be selective about what it binds to.
         */
 
-       master = spi_alloc_master(dev, sizeof *pp);
+       master = spi_alloc_master(dev, sizeof(*pp));
        if (!master) {
                status = -ENOMEM;
                goto done;
@@ -289,7 +289,6 @@ static void butterfly_attach(struct parport *p)
                pr_debug("%s: dataflash at %s\n", p->name,
                                dev_name(&pp->dataflash->dev));
 
-       // dev_info(_what?_, ...)
        pr_info("%s: AVR Butterfly\n", p->name);
        butterfly = pp;
        return;