From owner-svn-src-head@freebsd.org Wed May 11 17:38:11 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 307CDB37EDB; Wed, 11 May 2016 17:38:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D72271B6F; Wed, 11 May 2016 17:38:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BHcAhk049032; Wed, 11 May 2016 17:38:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BHc9mq049028; Wed, 11 May 2016 17:38:09 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201605111738.u4BHc9mq049028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 11 May 2016 17:38:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299471 - head/sys/dev/ida X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2016 17:38:11 -0000 Author: hselasky Date: Wed May 11 17:38:09 2016 New Revision: 299471 URL: https://svnweb.freebsd.org/changeset/base/299471 Log: Resolve LINT linking issue by renaming ida_init() to ida_setup(). The ida_init() symbol name is now taken for use by the LinuxKPI. Reported by: emaste @ Discussed with: mav @ Modified: head/sys/dev/ida/ida.c head/sys/dev/ida/ida_eisa.c head/sys/dev/ida/ida_pci.c head/sys/dev/ida/idavar.h Modified: head/sys/dev/ida/ida.c ============================================================================== --- head/sys/dev/ida/ida.c Wed May 11 17:27:27 2016 (r299470) +++ head/sys/dev/ida/ida.c Wed May 11 17:38:09 2016 (r299471) @@ -193,7 +193,7 @@ ida_alloc_qcbs(struct ida_softc *ida) } int -ida_init(struct ida_softc *ida) +ida_setup(struct ida_softc *ida) { struct ida_controller_info cinfo; device_t child; Modified: head/sys/dev/ida/ida_eisa.c ============================================================================== --- head/sys/dev/ida/ida_eisa.c Wed May 11 17:27:27 2016 (r299470) +++ head/sys/dev/ida/ida_eisa.c Wed May 11 17:38:09 2016 (r299471) @@ -333,7 +333,7 @@ ida_eisa_attach(device_t dev) return (ENOMEM); } - error = ida_init(ida); + error = ida_setup(ida); if (error) { ida_free(ida); return (error); Modified: head/sys/dev/ida/ida_pci.c ============================================================================== --- head/sys/dev/ida/ida_pci.c Wed May 11 17:27:27 2016 (r299470) +++ head/sys/dev/ida/ida_pci.c Wed May 11 17:38:09 2016 (r299471) @@ -294,7 +294,7 @@ ida_pci_attach(device_t dev) return (ENOMEM); } - error = ida_init(ida); + error = ida_setup(ida); if (error) { ida_free(ida); return (error); Modified: head/sys/dev/ida/idavar.h ============================================================================== --- head/sys/dev/ida/idavar.h Wed May 11 17:27:27 2016 (r299470) +++ head/sys/dev/ida/idavar.h Wed May 11 17:38:09 2016 (r299471) @@ -197,7 +197,7 @@ extern int ida_detach(device_t dev); extern struct ida_softc *ida_alloc(device_t dev, struct resource *regs, int regs_type, int regs_id, bus_dma_tag_t parent_dmat); extern void ida_free(struct ida_softc *ida); -extern int ida_init(struct ida_softc *ida); +extern int ida_setup(struct ida_softc *ida); extern int ida_command(struct ida_softc *ida, int command, void *data, int datasize, int drive, u_int32_t pblkno, int flags); extern void ida_submit_buf(struct ida_softc *ida, struct bio *bp);