Remove FSF address from GPL notices

[openocd.git] / src / target / arm_jtag.h

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 13b701fc31ea478a3305436f5634f056b1cd6cb4..dd9145124401c4178ba3b16f68ac3d18dc92f4a9 100644 (file)
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -16,9 +16,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifndef ARM_JTAG
@@ -36,20 +34,16 @@ struct arm_jtag {
        uint32_t intest_instr;
 };
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,
+int arm_jtag_set_instr_inner(struct jtag_tap *tap, uint32_t new_instr,
                void *no_verify_capture,
                tap_state_t end_state);
 
-static inline int arm_jtag_set_instr(struct arm_jtag *jtag_info,
+static inline int arm_jtag_set_instr(struct jtag_tap *tap,
                uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
        /* inline most common code path */
-       struct jtag_tap *tap;
-       tap = jtag_info->tap;
-       assert(tap != NULL);
-
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
-               return arm_jtag_set_instr_inner(jtag_info, new_instr, no_verify_capture, end_state);
+               return arm_jtag_set_instr_inner(tap, new_instr, no_verify_capture, end_state);
 
        return ERROR_OK;