From 4ba08529c620e1bc50d13a38954d3c6dc7890694 Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Thu, 10 Mar 2016 13:56:15 +0000 Subject: Enforce some naming sanity. Stop using 'sc_link' to mean two different things by renaming the field 'SLIST_HEAD(, scsi_link) sc_link' to 'sc_link_list' in struct scsibus_softc. Use 'sb' as the short name for scsibus_softc variables. Impetus from & ok bluhm@ --- sys/dev/ic/ahci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/ic') diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c index 9f6c596f3ab..0188ab32010 100644 --- a/sys/dev/ic/ahci.c +++ b/sys/dev/ic/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.23 2015/10/04 07:56:50 jmatthew Exp $ */ +/* $OpenBSD: ahci.c,v 1.24 2016/03/10 13:56:14 krw Exp $ */ /* * Copyright (c) 2006 David Gwynne @@ -3221,7 +3221,7 @@ ahci_hibernate_io(dev_t dev, daddr_t blkno, vaddr_t addr, size_t size, /* find the scsi_link for the device, which has the port */ port = -1; bus_sc = (struct scsibus_softc *)scsibus; - SLIST_FOREACH(link, &bus_sc->sc_link, bus_list) { + SLIST_FOREACH(link, &bus_sc->sc_link_list, bus_list) { if (link->device_softc == disk) { /* link->adapter_softc == sc->sc_atascsi */ port = link->target; -- cgit v1.2.3