userspace/libswitchhw: fixed warnings

21cfbe43 · Alessandro Rubini · 4ede2a74 · 21cfbe43 · 21cfbe43 · 21cfbe43
Commit 21cfbe43 authored May 17, 2011 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 9 deletions

fpga_io.c userspace/libswitchhw/fpga_io.c +5 -6

fpgaboot.c userspace/libswitchhw/fpgaboot.c +1 -1

xpoint.c userspace/libswitchhw/xpoint.c +0 -2

No files found.
--- a/userspace/libswitchhw/fpga_io.c
+++ b/userspace/libswitchhw/fpga_io.c
@@ -39,12 +39,6 @@ int shw_fpga_mmap_init()

 }

-int shw_main_fpga_init()
-{
-  shw_pio_configure(PIN_main_fpga_nrst);
-  shw_main_fpga_reset();
-}
-
 void shw_main_fpga_reset()
 {
    shw_pio_set0(PIN_main_fpga_nrst);
@@ -53,3 +47,8 @@ void shw_main_fpga_reset()
    usleep(10000);
 }

+int shw_main_fpga_init()
+{
+  shw_pio_configure(PIN_main_fpga_nrst);
+  shw_main_fpga_reset();
+}
--- a/userspace/libswitchhw/fpgaboot.c
+++ b/userspace/libswitchhw/fpgaboot.c
@@ -243,7 +243,7 @@ static int uncompress_and_boot_fpga(int fpga_id, struct fpga_image_entry  *ent)
 int shw_boot_fpga(int fpga_id)
 {
  char *fw_name;
-  char *fpga_name;
+  const char *fpga_name;
  int rev_id;
  uint32_t fw_hash;
  struct fpga_image_entry ent;

--- a/userspace/libswitchhw/xpoint.c
+++ b/userspace/libswitchhw/xpoint.c
@@ -186,12 +186,10 @@ static void adn4600_write_reg(uint8_t reg, uint8_t value)
  if(mi2c_put_byte(value)) goto txerr;

  mi2c_stop();
-  return 0;

 txerr:
  TRACE(TRACE_FATAL, "No I2C ack from ADN4600!");
  mi2c_stop();
-  return 0;
 }