From nobody Thu Apr 21 17:30:19 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A083A19919A6; Thu, 21 Apr 2022 17:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kkl17544bz4WqW; Thu, 21 Apr 2022 17:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650562220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNTGM8UWPBVOhD3aFuTpecK3lmQYiz2HwhXegqaYSIU=; b=Y8LzdRvU7PqIja3FjEDaVll8SDqIx2/CGPfB2HtSuoVhZQT0FyaXlsTQpw+ZjwaHkCqyDe NnnrNYWLo6U1sxx4YE4foApoUPJ3VOmpE0N2hKA7OTSl3abOjeWgbsiV4/osJjREk2u3en /aXDuGr0azrI+Q+q2z9xUhFPkGZkqg5GxAUjycbaehRD80LXZ6D4PTW5ELz5koOgfGscZV QoSHhd48gnO5thYI2ydqIvqlnzWrGQF7jVS8WxaG0E+/9kKuwjb36JRfGmnRppDd1/dGrY d6OPWcL2cGk/Qur6YvGGS8CoQBGSZwH8v2AZRpqaVC/aAI9OWpNsTMdYXgdBqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89DBA4CBA; Thu, 21 Apr 2022 17:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23LHUJIW007218; Thu, 21 Apr 2022 17:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LHUJcE007212; Thu, 21 Apr 2022 17:30:19 GMT (envelope-from git) Date: Thu, 21 Apr 2022 17:30:19 GMT Message-Id: <202204211730.23LHUJcE007212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1ac10fa42937 - main - acpi_toshiba: Use device_get_softc in attach. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ac10fa429370731be57dee76b19896e01764b76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650562220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNTGM8UWPBVOhD3aFuTpecK3lmQYiz2HwhXegqaYSIU=; b=V11ClNHJ40kG8EDjUp/ngArXCTqNuW3T0mdYQ1QUdcAfsYCRmMqs4dxMDgHi4TZk7mKSv2 y4NQHcnJRHwepNmTA3vza0jCcBKiH7za/IbYGwYwGzvehNDzYYQdIavbf4sq3SuRmtIttF OOQuobUQGcCeIwLkXaADbcOrQtTVsWhtursNl+37agNTiw2uLHrUof8d8EIQVzwMN+Ju4U JNTZxsSPLLP+i8SOr4BMovoEo3Bx49Nqsx9UBiWxfULL8n9rHBLCIbRStchok15NGudjZI PP7D+c/cKsf8ddATEVfQ5qlnJBnVQ17mZW4oRvl+Zs1fAqeIyiAMdwSwCOYOEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650562220; a=rsa-sha256; cv=none; b=esfDXH8KOH11H4S7wx5ts49/PiNgfRHQThiggpLQfUaThtKYRKEA5o546nvbAJYqDUrmnM 9hxbtpdaO7rOxxqZ4bipl59C04OkqKyMpoJsATwGAU6mNo01nn61RrztOo4T61I9IDtbjO 1ynSpJpCQUXp+zzWUImi4NA9R8o6KM4FU8Z29Mc5GimyZ0782GN8Cdh1zvNxwxfuQi6VsK /bWGbkRAlLVA7ZW/Qx5vLtp4JWPpZlviFkDfWiezFWGkh/DqIQodrLyVwmGkKcglTew2+P j/2Iwt7hpyPpGzzulPgAXboeT3IbVdw0crcLkYao3ugpT5nG5XMFE0uCPyvD1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1ac10fa429370731be57dee76b19896e01764b76 commit 1ac10fa429370731be57dee76b19896e01764b76 Author: John Baldwin AuthorDate: 2022-04-21 17:29:15 +0000 Commit: John Baldwin CommitDate: 2022-04-21 17:29:15 +0000 acpi_toshiba: Use device_get_softc in attach. Rather than a detour via the devclass and hardcoding unit 0. While here, remove a check for sc being NULL. It will never be NULL when attach is called. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35010 --- sys/dev/acpi_support/acpi_toshiba.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/acpi_support/acpi_toshiba.c b/sys/dev/acpi_support/acpi_toshiba.c index c5233579d560..208cc36c9a59 100644 --- a/sys/dev/acpi_support/acpi_toshiba.c +++ b/sys/dev/acpi_support/acpi_toshiba.c @@ -562,9 +562,7 @@ acpi_toshiba_video_attach(device_t dev) { struct acpi_toshiba_softc *sc; - sc = devclass_get_softc(acpi_toshiba_devclass, 0); - if (sc == NULL) - return (ENXIO); + sc = device_get_softc(dev); sc->video_handle = acpi_get_handle(dev); return (0); }