diff options
| author | Warner Losh <imp@FreeBSD.org> | 2009-02-10 22:46:36 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2009-02-10 22:46:36 +0000 |
| commit | f2aa0e9f8859d391c50deab22771d2e71d09957c (patch) | |
| tree | d40d211bae445b2e347115b0fd004fcaffbcfc07 /sys/dev | |
| parent | b7208da623cbee6ef0525fcc40c6df7a9912126a (diff) | |
| download | src-f2aa0e9f8859d391c50deab22771d2e71d09957c.tar.gz src-f2aa0e9f8859d391c50deab22771d2e71d09957c.zip | |
fix arcmsr_attach, probe, detach, and shutdown prototypes to match newbus.
Notes
Notes:
svn path=/head/; revision=188460
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/arcmsr/arcmsr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index 74c807fdf58e..416bd5dafe8d 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -140,12 +140,12 @@ */ static struct CommandControlBlock * arcmsr_get_freesrb(struct AdapterControlBlock *acb); static u_int8_t arcmsr_seek_cmd2abort(union ccb * abortccb); -static u_int32_t arcmsr_probe(device_t dev); -static u_int32_t arcmsr_attach(device_t dev); -static u_int32_t arcmsr_detach(device_t dev); +static int arcmsr_probe(device_t dev); +static int arcmsr_attach(device_t dev); +static int arcmsr_detach(device_t dev); static u_int32_t arcmsr_iop_ioctlcmd(struct AdapterControlBlock *acb, u_int32_t ioctl_cmd, caddr_t arg); static void arcmsr_iop_parking(struct AdapterControlBlock *acb); -static void arcmsr_shutdown(device_t dev); +static int arcmsr_shutdown(device_t dev); static void arcmsr_interrupt(struct AdapterControlBlock *acb); static void arcmsr_polling_srbdone(struct AdapterControlBlock *acb, struct CommandControlBlock *poll_srb); static void arcmsr_free_resource(struct AdapterControlBlock *acb); @@ -3029,7 +3029,7 @@ static u_int32_t arcmsr_initialize(device_t dev) ************************************************************************ ************************************************************************ */ -static u_int32_t arcmsr_attach(device_t dev) +static int arcmsr_attach(device_t dev) { struct AdapterControlBlock *acb=(struct AdapterControlBlock *)device_get_softc(dev); u_int32_t unit=device_get_unit(dev); @@ -3152,7 +3152,7 @@ static u_int32_t arcmsr_attach(device_t dev) ************************************************************************ ************************************************************************ */ -static u_int32_t arcmsr_probe(device_t dev) +static int arcmsr_probe(device_t dev) { u_int32_t id; static char buf[256]; @@ -3197,7 +3197,7 @@ static u_int32_t arcmsr_probe(device_t dev) ************************************************************************ ************************************************************************ */ -static void arcmsr_shutdown(device_t dev) +static int arcmsr_shutdown(device_t dev) { u_int32_t i; u_int32_t intmask_org; @@ -3231,13 +3231,13 @@ static void arcmsr_shutdown(device_t dev) acb->workingsrb_doneindex=0; acb->workingsrb_startindex=0; ARCMSR_LOCK_RELEASE(&acb->qbuffer_lock); - return; + return (0); } /* ************************************************************************ ************************************************************************ */ -static u_int32_t arcmsr_detach(device_t dev) +static int arcmsr_detach(device_t dev) { struct AdapterControlBlock *acb=(struct AdapterControlBlock *)device_get_softc(dev); int i; |