Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 11 May 2016 17:38:09 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299471 - head/sys/dev/ida
Message-ID:  <201605111738.u4BHc9mq049028@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605111738.u4BHc9mq049028>