fpga: altera: cyclon2: Fix most checkpatch warnings

Nothing special, but done before further cleanup.

* spacing
* braces
* __FUNCTION__ → __func__

Suggested-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Alexander Dahl <ada@thorsis.com>

diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 6755956e85f59c23eb087d0f06673e793b01dd0a..99a64d437cc6722529d3f97a1c40f12e804b9935 100644 (file)
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -11,9 +11,9 @@
 
 /* Define FPGA_DEBUG to get debug printf's */
 #ifdef FPGA_DEBUG
-#define PRINTF(fmt,args...)    printf (fmt ,##args)
+#define PRINTF(fmt, args...)   printf(fmt, ##args)
 #else
-#define PRINTF(fmt,args...)
+#define PRINTF(fmt, args...)
 #endif
 
 /* Note: The assumption is that we cannot possibly run fast enough to
@@ -26,7 +26,7 @@
 #endif
 
 #ifndef CONFIG_SYS_FPGA_WAIT
-#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ/10          /* 100 ms */
+#define CONFIG_SYS_FPGA_WAIT CONFIG_SYS_HZ / 10                /* 100 ms */
 #endif
 
 static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize);
@@ -41,8 +41,8 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
 
        switch (desc->iface) {
        case passive_serial:
-               PRINTF ("%s: Launching Passive Serial Loader\n", __FUNCTION__);
-               ret_val = CYC2_ps_load (desc, buf, bsize);
+               PRINTF("%s: Launching Passive Serial Loader\n", __func__);
+               ret_val = CYC2_ps_load(desc, buf, bsize);
                break;
 
        case fast_passive_parallel:
@@ -50,16 +50,16 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
                 * done in the write() callback. Use the existing PS load
                 * function for FPP, too.
                 */
-               PRINTF ("%s: Launching Fast Passive Parallel Loader\n",
-                     __FUNCTION__);
+               PRINTF("%s: Launching Fast Passive Parallel Loader\n",
+                      __func__);
                ret_val = CYC2_ps_load(desc, buf, bsize);
                break;
 
                /* Add new interface types here */
 
        default:
-               printf ("%s: Unsupported interface type, %d\n",
-                               __FUNCTION__, desc->iface);
+               printf("%s: Unsupported interface type, %d\n",
+                      __func__, desc->iface);
        }
 
        return ret_val;
@@ -71,59 +71,58 @@ int CYC2_dump(Altera_desc *desc, const void *buf, size_t bsize)
 
        switch (desc->iface) {
        case passive_serial:
-               PRINTF ("%s: Launching Passive Serial Dump\n", __FUNCTION__);
-               ret_val = CYC2_ps_dump (desc, buf, bsize);
+               PRINTF("%s: Launching Passive Serial Dump\n", __func__);
+               ret_val = CYC2_ps_dump(desc, buf, bsize);
                break;
 
                /* Add new interface types here */
 
        default:
-               printf ("%s: Unsupported interface type, %d\n",
-                               __FUNCTION__, desc->iface);
+               printf("%s: Unsupported interface type, %d\n",
+                      __func__, desc->iface);
        }
 
        return ret_val;
 }
 
-int CYC2_info( Altera_desc *desc )
+int CYC2_info(Altera_desc *desc)
 {
        return FPGA_SUCCESS;
 }
 
 /* ------------------------------------------------------------------------- */
-/* CYCLON2 Passive Serial Generic Implementation                                  */
+/* CYCLON2 Passive Serial Generic Implementation                             */
 static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 {
        int ret_val = FPGA_FAIL;        /* assume the worst */
        Altera_CYC2_Passive_Serial_fns *fn = desc->iface_fns;
        int     ret = 0;
 
-       PRINTF ("%s: start with interface functions @ 0x%p\n",
-                       __FUNCTION__, fn);
+       PRINTF("%s: start with interface functions @ 0x%p\n",
+              __func__, fn);
 
        if (fn) {
                int cookie = desc->cookie;      /* make a local copy */
                unsigned long ts;               /* timestamp */
 
-               PRINTF ("%s: Function Table:\n"
+               PRINTF("%s: Function Table:\n"
                                "ptr:\t0x%p\n"
                                "struct: 0x%p\n"
                                "config:\t0x%p\n"
                                "status:\t0x%p\n"
                                "write:\t0x%p\n"
                                "done:\t0x%p\n\n",
-                               __FUNCTION__, &fn, fn, fn->config, fn->status,
+                               __func__, &fn, fn, fn->config, fn->status,
                                fn->write, fn->done);
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
-               printf ("Loading FPGA Device %d...", cookie);
+               printf("Loading FPGA Device %d...", cookie);
 #endif
 
                /*
                 * Run the pre configuration function if there is one.
                 */
-               if (*fn->pre) {
+               if (*fn->pre)
                        (*fn->pre) (cookie);
-               }
 
                /* Establish the initial state */
                (*fn->config) (false, true, cookie);    /* De-assert nCONFIG */
@@ -133,22 +132,23 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
                udelay(2);              /* T_cfg > 2us  */
 
                /* Wait for nSTATUS to be asserted */
-               ts = get_timer (0);             /* get current time */
+               ts = get_timer(0);              /* get current time */
                do {
-                       CONFIG_FPGA_DELAY ();
-                       if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {    /* check the time */
-                               puts ("** Timeout waiting for STATUS to go high.\n");
+                       CONFIG_FPGA_DELAY();
+                       if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT) {
+                               /* check the time */
+                               puts("** Timeout waiting for STATUS to go high.\n");
                                (*fn->abort) (cookie);
                                return FPGA_FAIL;
                        }
                } while (!(*fn->status) (cookie));
 
                /* Get ready for the burn */
-               CONFIG_FPGA_DELAY ();
+               CONFIG_FPGA_DELAY();
 
                ret = (*fn->write) (buf, bsize, true, cookie);
                if (ret) {
-                       puts ("** Write failed.\n");
+                       puts("** Write failed.\n");
                        (*fn->abort) (cookie);
                        return FPGA_FAIL;
                }
@@ -156,20 +156,20 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
                puts(" OK? ...");
 #endif
 
-               CONFIG_FPGA_DELAY ();
+               CONFIG_FPGA_DELAY();
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
-               putc (' ');                     /* terminate the dotted line */
+               putc(' ');                      /* terminate the dotted line */
 #endif
 
        /*
         * Checking FPGA's CONF_DONE signal - correctly booted ?
         */
 
-       if ( ! (*fn->done) (cookie) ) {
-               puts ("** Booting failed! CONF_DONE is still deasserted.\n");
+       if (!(*fn->done) (cookie)) {
+               puts("** Booting failed! CONF_DONE is still deasserted.\n");
                (*fn->abort) (cookie);
-               return (FPGA_FAIL);
+               return FPGA_FAIL;
        }
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
        puts(" OK\n");
@@ -178,17 +178,15 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
        ret_val = FPGA_SUCCESS;
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
-       if (ret_val == FPGA_SUCCESS) {
-               puts ("Done.\n");
-       }
-       else {
-               puts ("Fail.\n");
-       }
+       if (ret_val == FPGA_SUCCESS)
+               puts("Done.\n");
+       else
+               puts("Fail.\n");
 #endif
        (*fn->post) (cookie);
 
        } else {
-               printf ("%s: NULL Interface function table!\n", __FUNCTION__);
+               printf("%s: NULL Interface function table!\n", __func__);
        }
 
        return ret_val;
@@ -198,7 +196,6 @@ static int CYC2_ps_dump(Altera_desc *desc, const void *buf, size_t bsize)
 {
        /* Readback is only available through the Slave Parallel and         */
        /* boundary-scan interfaces.                                         */
-       printf ("%s: Passive Serial Dumping is unavailable\n",
-                       __FUNCTION__);
+       printf("%s: Passive Serial Dumping is unavailable\n", __func__);
        return FPGA_FAIL;
 }