Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / net / cxgb3 / mc5.c

diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c
index 3b5517b8fbde74a1131d932c890d0d5e3f39ab97..e13b7fe9d082f3290188dc9cf0f2c696ab73f9a3 100644 (file)
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/cxgb3/mc5.c
@@ -318,7 +318,7 @@ static void mc5_dbgi_mode_disable(const struct mc5 *mc5)
 
 /*
  * Initialization that requires the OS and protocol layers to already
- * be intialized goes here.
+ * be initialized goes here.
  */
 int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters,
                unsigned int nroutes)
@@ -374,44 +374,6 @@ int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters,
        return err;
 }
 
-/*
- *     read_mc5_range - dump a part of the memory managed by MC5
- *     @mc5: the MC5 handle
- *     @start: the start address for the dump
- *     @n: number of 72-bit words to read
- *     @buf: result buffer
- *
- *     Read n 72-bit words from MC5 memory from the given start location.
- */
-int t3_read_mc5_range(const struct mc5 *mc5, unsigned int start,
-                     unsigned int n, u32 *buf)
-{
-       u32 read_cmd;
-       int err = 0;
-       struct adapter *adap = mc5->adapter;
-
-       if (mc5->part_type == IDT75P52100)
-               read_cmd = IDT_CMD_READ;
-       else if (mc5->part_type == IDT75N43102)
-               read_cmd = IDT4_CMD_READ;
-       else
-               return -EINVAL;
-
-       mc5_dbgi_mode_enable(mc5);
-
-       while (n--) {
-               t3_write_reg(adap, A_MC5_DB_DBGI_REQ_ADDR0, start++);
-               if (mc5_cmd_write(adap, read_cmd)) {
-                       err = -EIO;
-                       break;
-               }
-               dbgi_rd_rsp3(adap, buf + 2, buf + 1, buf);
-               buf += 3;
-       }
-
-       mc5_dbgi_mode_disable(mc5);
-       return 0;
-}
 
 #define MC5_INT_FATAL (F_PARITYERR | F_REQQPARERR | F_DISPQPARERR)