Changeset 5240 for i2c-tools/trunk/tools/i2cdump.c

Timestamp:

05/05/08 16:54:18 (4 years ago)

Author:

khali

Message:

No need to print the i2c bus number in functionality error message.

Files:

• i2c-tools/trunk/tools/i2cdump.c (modified) (8 diffs)

i2c-tools/trunk/tools/i2cdump.c

@@ -47 +47 @@
 }
 
-static int check_funcs(int file, int i2cbus, int size, int pec)
+static int check_funcs(int file, int size, int pec)
 {
         unsigned long funcs;
@@ -61 +61 @@
         case I2C_SMBUS_BYTE:
                 if (!((funcs & I2C_FUNC_SMBUS_BYTE) == I2C_FUNC_SMBUS_BYTE)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have byte capability\n", i2cbus);
+                        fprintf(stderr, "Error: Adapter does "
+                                "not have byte capability\n");
                         return -1;
                 }
@@ -69 +69 @@
         case I2C_SMBUS_BYTE_DATA:
                 if (!(funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have byte read capability\n", i2cbus);
+                        fprintf(stderr, "Error: Adapter does "
+                                "not have byte read capability\n");
                         return -1;
                 }
@@ -77 +77 @@
         case I2C_SMBUS_WORD_DATA:
                 if (!(funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have word read capability\n", i2cbus);
+                        fprintf(stderr, "Error: Adapter does "
+                                "not have word read capability\n");
                         return -1;
                 }
@@ -85 +85 @@
         case I2C_SMBUS_BLOCK_DATA:
                 if (!(funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have smbus block read capability\n",
-                                i2cbus);
+                        fprintf(stderr, "Error: Adapter does "
+                                "not have smbus block read capability\n");
                         return -1;
                 }
@@ -94 +93 @@
         case I2C_SMBUS_I2C_BLOCK_DATA:
                 if (!(funcs & I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have i2c block read capability\n",
-                                i2cbus);
+                        fprintf(stderr, "Error: Adapter does "
+                                "not have i2c block read capability\n");
                         return -1;
                 }
@@ -104 +102 @@
         if (pec
          && !(funcs & (I2C_FUNC_SMBUS_PEC | I2C_FUNC_I2C))) {
-                fprintf(stderr, "Warning: Adapter for i2c bus %d does "
-                        "not seem to support PEC\n", i2cbus);
+                fprintf(stderr, "Warning: Adapter does "
+                        "not seem to support PEC\n");
         }
 
@@ -265 +263 @@
         file = open_i2c_dev(i2cbus, filename, 0);
         if (file < 0
-         || check_funcs(file, i2cbus, size, pec)
+         || check_funcs(file, size, pec)
          || set_slave_addr(file, address, force))
                 exit(1);