From nobody Sat Apr 9 01:31:55 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 50AC51A8BC3F; Sat, 9 Apr 2022 01:31:56 +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 4KZyJq6xXRz4jj4; Sat, 9 Apr 2022 01:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649467916; 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=zp0u94hcwfn9J9OPVtoTmxiRRsKpk/D3Oe4dg5QEaSQ=; b=A3XE6lDz6toFqW6TyBfNraAhvDX87VA9qQShsBlj/THgYnaPMKwNDkZ1tbzaafPyohzyfq 3nBzakAoYze/kev1tSxcGnhDd9MRr2Erg7MOAC50DC5NEK7AV9hqOl6kJKLkhnl9Bw/ElJ Jm6dUy8TZ+BIYwxZrJ6s3DGDaJ96hmLc4tY9+OelzxcixLlZharXBAc6OafPh9u/Fj6WPM Nww5Ys0RCBfYIhRT95rhTfEKZ1kfoMTzBVCamJlsN0JqWsUsiWPECua7DQcwzBxjZDE712 WxQX/nbCsNpphonMb8eAszNuinm5oKBdXqb72ZpOt8jOUtt+y6827Gsa8lbvTA== 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 B2A5810B0C; Sat, 9 Apr 2022 01:31:55 +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 2391VtZ1049567; Sat, 9 Apr 2022 01:31:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2391VtXw049566; Sat, 9 Apr 2022 01:31:55 GMT (envelope-from git) Date: Sat, 9 Apr 2022 01:31:55 GMT Message-Id: <202204090131.2391VtXw049566@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: 54319253009b - main - ti_prm: Use existing dev in debug traces and remove unused sc. 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: 54319253009bde13bcf1c7f5070775d7ec18d3a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649467916; 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=zp0u94hcwfn9J9OPVtoTmxiRRsKpk/D3Oe4dg5QEaSQ=; b=O3sXQHoBgR6tDF2YUSiN2EBjEsDazu+eYyYODn8sjb+490RJj+cknJB2zPj6KcWA4Nmjpf RNaPR783d9dK2rurTCWpy+5DLSNwDV4yDRoZ3/c7RGqNC1Gb8dH1HLcParmi+InIUnK88Q RNbioLn3Kq1JQjS525GKB7U4mCtQMWeuBWVAGHuVu4UZfK/52baIzGbnR+9LzZN0rIy4a5 k5RYNXgn8sWn8ySwe+GSyeyY/jAAoxar7ettV+2hi4gRUHB2EL5+o0WdyyvMyYYPunS6WH eODYzoVoEArgYpy9w++5g0ElHegT8nY7eIR822jszeg9wB9y4+7zy5RXy8MNlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649467916; a=rsa-sha256; cv=none; b=wp5vTYWV5Wq7ImJXCoxs0+dd3Is4rdBOCJE2BdQJEUwRjtaW65DjG54XbTpp4EfhQnW8Go ZwhziNj+eos5pGRCbAIy1msp7hHsGQjbbRj1mxTZAKLqz3CHZSCl+NYMy6IeaxuCSDisWQ gyxYcY++WGtXq6a9pb8qf3UKorDFgORSK8LustC1CiQKhwYCTMLFriMqVK2vBxMZUXScFK pTQSJC21MUCNRfjxpgTPH0i4v+8mST7/Fu8hIulZ+cDPDqBCrw8jRFX312Y+rCVFziaSIi 6MXmHQYwHD7bMgqnpy/hDANjChvycGIZIeki8FfZlgovfSPly/xE8i4BFFOiJg== 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=54319253009bde13bcf1c7f5070775d7ec18d3a4 commit 54319253009bde13bcf1c7f5070775d7ec18d3a4 Author: John Baldwin AuthorDate: 2022-04-09 01:31:30 +0000 Commit: John Baldwin CommitDate: 2022-04-09 01:31:30 +0000 ti_prm: Use existing dev in debug traces and remove unused sc. --- sys/arm/ti/ti_prm.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/arm/ti/ti_prm.c b/sys/arm/ti/ti_prm.c index 4a57fbb8b972..64edcf8c28f5 100644 --- a/sys/arm/ti/ti_prm.c +++ b/sys/arm/ti/ti_prm.c @@ -146,12 +146,10 @@ ti_prm_reset(device_t dev) int ti_prm_write_4(device_t dev, bus_addr_t addr, uint32_t val) { - struct ti_prm_softc *sc; device_t parent; parent = device_get_parent(dev); - sc = device_get_softc(dev); - DPRINTF(sc->dev, "offset=%lx write %x\n", addr, val); + DPRINTF(dev, "offset=%lx write %x\n", addr, val); ti_prcm_device_lock(parent); ti_prcm_write_4(parent, addr, val); ti_prcm_device_unlock(parent); @@ -161,32 +159,28 @@ ti_prm_write_4(device_t dev, bus_addr_t addr, uint32_t val) int ti_prm_read_4(device_t dev, bus_addr_t addr, uint32_t *val) { - struct ti_prm_softc *sc; device_t parent; parent = device_get_parent(dev); - sc = device_get_softc(dev); ti_prcm_device_lock(parent); ti_prcm_read_4(parent, addr, val); ti_prcm_device_unlock(parent); - DPRINTF(sc->dev, "offset=%lx Read %x\n", addr, *val); + DPRINTF(dev, "offset=%lx Read %x\n", addr, *val); return (0); } int ti_prm_modify_4(device_t dev, bus_addr_t addr, uint32_t clr, uint32_t set) { - struct ti_prm_softc *sc; device_t parent; parent = device_get_parent(dev); - sc = device_get_softc(dev); ti_prcm_device_lock(parent); ti_prcm_modify_4(parent, addr, clr, set); ti_prcm_device_unlock(parent); - DPRINTF(sc->dev, "offset=%lx (clr %x set %x)\n", addr, clr, set); + DPRINTF(dev, "offset=%lx (clr %x set %x)\n", addr, clr, set); return (0); }