From owner-svn-src-stable@freebsd.org Wed Dec 14 15:38:29 2016 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A128BC80B15; Wed, 14 Dec 2016 15:38:29 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 654F61E2B; Wed, 14 Dec 2016 15:38:29 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBEFcS89077402; Wed, 14 Dec 2016 15:38:28 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBEFcSWl077401; Wed, 14 Dec 2016 15:38:28 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201612141538.uBEFcSWl077401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Wed, 14 Dec 2016 15:38:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r310062 - stable/10/sys/dev/smbus X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Dec 2016 15:38:29 -0000 Author: avg Date: Wed Dec 14 15:38:28 2016 New Revision: 310062 URL: https://svnweb.freebsd.org/changeset/base/310062 Log: make smbus_get_addr() an ivar accessor This is a direct commit to this branch. smbus_get_addr() was declared as a funciton prototype, but the function was never defined. read_ivar and write_ivar methods were unused. This was exposed after jedec_ts driver was imported to this branch as that driver turned out to be the first user of smbus_get_addr(). This change is a small subset of a larger change in r281985. Reported by: jhb Pointyhat to: avg Modified: stable/10/sys/dev/smbus/smbconf.h Modified: stable/10/sys/dev/smbus/smbconf.h ============================================================================== --- stable/10/sys/dev/smbus/smbconf.h Wed Dec 14 15:00:24 2016 (r310061) +++ stable/10/sys/dev/smbus/smbconf.h Wed Dec 14 15:38:28 2016 (r310062) @@ -74,7 +74,9 @@ /* * ivars codes */ -#define SMBUS_IVAR_ADDR 0x1 /* slave address of the device */ +enum smbus_ivars { + SMBUS_IVAR_ADDR, /* slave address of the device */ +}; int smbus_request_bus(device_t, device_t, int); int smbus_release_bus(device_t, device_t); @@ -83,7 +85,12 @@ int smbus_error(int error); void smbus_intr(device_t, u_char, char low, char high, int error); -u_char smbus_get_addr(device_t); +#define SMBUS_ACCESSOR(var, ivar, type) \ + __BUS_ACCESSOR(smbus, var, SMBUS, ivar, type) + +SMBUS_ACCESSOR(addr, ADDR, int) + +#undef SMBUS_ACCESSOR extern driver_t smbus_driver; extern devclass_t smbus_devclass;