Signed-off-by: Ben Marsh <bmars...@gmail.com>
---
 drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c 
b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
index a3a10f9..f29a75d 100644
--- a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
+++ b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
@@ -9,9 +9,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
@@ -34,7 +31,7 @@
 #define DEVICE_NAME "device"
 #define CLASS_NAME  "fpgaboot"
 
-static uint8_t bits_magic[] = {
+static u8 bits_magic[] = {
        0x0, 0x9, 0xf, 0xf0, 0xf, 0xf0,
        0xf, 0xf0, 0xf, 0xf0, 0x0, 0x0, 0x1};
 
@@ -54,7 +51,7 @@ static void read_bitstream(char *bitdata, char *buf, int 
*offset, int rdsize)
 static void readinfo_bitstream(char *bitdata, char *buf, int *offset)
 {
        char tbuf[64];
-       int32_t len;
+       s32 len;
 
        /* read section char */
        read_bitstream(bitdata, tbuf, offset, 1);
@@ -93,7 +90,6 @@ static int readlength_bitstream(char *bitdata, int *lendata, 
int *offset)
        return 0;
 }
 
-
 /*
  * read first 13 bytes to check bitstream magic number
  */
@@ -201,7 +197,7 @@ static int gs_download_image(struct fpgaimage *fimage, enum 
wbus bus_bytes)
 #endif /* DEBUG_FPGA */
        if (!xl_supported_prog_bus_width(bus_bytes)) {
                pr_err("unsupported program bus width %d\n",
-                               bus_bytes);
+                      bus_bytes);
                return -1;
        }
 
@@ -222,7 +218,7 @@ static int gs_download_image(struct fpgaimage *fimage, enum 
wbus bus_bytes)
        pr_info("device init done\n");
 
        for (i = 0; i < size; i += bus_bytes)
-               xl_shift_bytes_out(bus_bytes, bitdata+i);
+               xl_shift_bytes_out(bus_bytes, bitdata + i);
 
        pr_info("program done\n");
 
@@ -277,7 +273,7 @@ static int gs_set_download_method(struct fpgaimage *fimage)
 static int init_driver(void)
 {
        firmware_pdev = platform_device_register_simple("fpgaboot", -1,
-                                                        NULL, 0);
+                                                       NULL, 0);
        return PTR_ERR_OR_ZERO(firmware_pdev);
 }
 
@@ -291,7 +287,7 @@ static int gs_fpgaboot(void)
        int err;
        struct fpgaimage        *fimage;
 
-       fimage = kmalloc(sizeof(struct fpgaimage), GFP_KERNEL);
+       fimage = kmalloc(sizeof(*fimage), GFP_KERNEL);
        if (!fimage)
                return -ENOMEM;
 
@@ -336,7 +332,6 @@ err_out1:
        kfree(fimage);
 
        return -1;
-
 }
 
 static int __init gs_fpgaboot_init(void)
-- 
1.9.1


_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to