From nobody Tue Feb 10 03:39:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879844; cv=none; d=zohomail.com; s=zohoarc; b=iZYqwjbQZyTwhPzK7QAAXkdt+2FFLBcUP2uaaXEhaji9sj9kCrMyiQNilOh215HhHWR1K0QFDMUwImji1IIqxHeXCrd7CleOEzm6sm6MztYZ5ji6OupilHKR1GUIaZA5qKGB7xgg6ntRbePaycfVL9zZKAD7h6GSVpDqYBCOSqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879844; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=LChGAVp/XRzPhJ+O5cVspYa7x/I9Bhkrlowp7Z52z4oZ8+hbXjXnxnvqbuQeN+rP3aWAtY/dOK33sNfQp+OjAEunnAs6KCoCGWcFnLYRhX5gG62h5xMORbAacuZuY1WRtAtg5S7p5L6cU30yGvBib2rIHnaxqWAbpO54CGq75xM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1623879844100312.1131929561658; Wed, 16 Jun 2021 14:44:04 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id z8so4231006wrp.12 for ; Wed, 16 Jun 2021 14:44:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id z6sm503498wrl.15.2021.06.16.14.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=qV7V8ajq5SO9Dkmn7fJaakBUZiAJ7MexVY4MKZtdyXMF53pDkpRGEFZ9moMRN4GXXT L7GUmh/CnoP5N18MipnoYVe3MYotZMhcfDzoeWmgWDLHHiy5h3Q/muwK3LoJIXkUoIBX 2BSRyDDlzGQKmcoj7HCemZYsKnEuYsjscw1XA7nRDIU6dv00cuk0TDofVEb74bYOkGGO cqVpDK8I4/5RjkQCxNDXGNPFoRJBkeaw36mYVNMLsSGISyRBYMRt0DW7DWQoKqPiDazn dbOaUzG5nF+y8AL025uYmo+toNdI6bYWofAMxb/pnyjn3dxLECO1Kq49iQ0R6OTBlt3f 6kyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=Rjstn9mmbq/LeZIo9e3gGeLxjncWfcmxf60QktUq7Nr7F4wrUGvCoX5K2gsf3GPHUY NGALJ/qvv+RSLeXmqUTctWFcB/IWZI2rhCy/DFjKGxXhCSVdhUgKJ2fxEyTSNbvkgDCx addD/wWpwjyJ+Ke6kT9l2T9WxyuNFE0NS9PBp3Ek3Bh26HLlIB0K+Qy7m5mYgP5LHeqx 3q2JJAJmQqZ16gc/aHfNfJU/javkJGkJnNMoKWn6Y5y8CswPZAFUAvdkdaSkUS4vctC9 PeFofC69U8pMEuco2/69Tfgx3mA+Wcmu50xGr7ot2yyXOzsUMZglyrL4U8HwoQxpslau dvtA== X-Gm-Message-State: AOAM531mYn/G3SZVQ0hFBwA8S5o/G3X1Nxgg8f+FgKdT+1vRF8UL0epb GWyvMqRxi5kYrbrJmYB8/SNgu5Wlgr5Mjg== X-Google-Smtp-Source: ABdhPJxlqd1oARoHp1skaocwW7kWZzUBf6Jc4VP6k2JZ3tNSxR0pb2AGQBk7ItHUk/Yhn1pavLtq+A== X-Received: by 2002:adf:fa08:: with SMTP id m8mr1360256wrr.319.1623879842361; Wed, 16 Jun 2021 14:44:02 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 12/15] hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address() Date: Wed, 16 Jun 2021 23:42:51 +0200 Message-Id: <20210616214254.2647796-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Other functions from I2C slave API are named "i2c_slave_XXX()". Follow that pattern with set_address(). Add docstring along. No logical change. Patch created mechanically using: $ sed -i s/i2c_set_slave_address/i2c_slave_set_address/ \ $(git grep -l i2c_set_slave_address) Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i2c/i2c.h | 8 +++++++- hw/arm/pxa2xx.c | 2 +- hw/arm/spitz.c | 4 ++-- hw/display/ati.c | 2 +- hw/display/sm501.c | 2 +- hw/display/xlnx_dp.c | 2 +- hw/i2c/core.c | 2 +- hw/i2c/imx_i2c.c | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 99635b837a5..2adf521b271 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -79,7 +79,6 @@ struct I2CBus { }; =20 I2CBus *i2c_init_bus(DeviceState *parent, const char *name); -void i2c_set_slave_address(I2CSlave *dev, uint8_t address); int i2c_bus_busy(I2CBus *bus); int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv); void i2c_end_transfer(I2CBus *bus); @@ -141,6 +140,13 @@ I2CSlave *i2c_slave_create_simple(I2CBus *bus, const c= har *name, uint8_t addr); */ bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp); =20 +/** + * Set the I2C bus address of a slave device + * @dev: I2C slave device + * @address: I2C address of the slave when put on a bus + */ +void i2c_slave_set_address(I2CSlave *dev, uint8_t address); + extern const VMStateDescription vmstate_i2c_slave; =20 #define VMSTATE_I2C_SLAVE(_field, _state) { \ diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index fdc4955e95b..15a247efae2 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1437,7 +1437,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr add= r, break; =20 case ISAR: - i2c_set_slave_address(I2C_SLAVE(s->slave), value & 0x7f); + i2c_slave_set_address(I2C_SLAVE(s->slave), value & 0x7f); break; =20 case IDBR: diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index b45a929cbd9..c0f0f8193f4 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -769,9 +769,9 @@ static void spitz_wm8750_addr(void *opaque, int line, i= nt level) { I2CSlave *wm =3D (I2CSlave *) opaque; if (level) - i2c_set_slave_address(wm, SPITZ_WM_ADDRH); + i2c_slave_set_address(wm, SPITZ_WM_ADDRH); else - i2c_set_slave_address(wm, SPITZ_WM_ADDRL); + i2c_slave_set_address(wm, SPITZ_WM_ADDRL); } =20 static void spitz_i2c_setup(PXA2xxState *cpu) diff --git a/hw/display/ati.c b/hw/display/ati.c index 4c3ad8f47b0..31f22754dce 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -968,7 +968,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **err= p) I2CBus *i2cbus =3D i2c_init_bus(DEVICE(s), "ati-vga.ddc"); bitbang_i2c_init(&s->bbi2c, i2cbus); I2CSlave *i2cddc =3D I2C_SLAVE(qdev_new(TYPE_I2CDDC)); - i2c_set_slave_address(i2cddc, 0x50); + i2c_slave_set_address(i2cddc, 0x50); qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort); =20 /* mmio register space */ diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 569661a0746..663c37e7f28 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1828,7 +1828,7 @@ static void sm501_init(SM501State *s, DeviceState *de= v, s->i2c_bus =3D i2c_init_bus(dev, "sm501.i2c"); /* ddc */ I2CDDCState *ddc =3D I2CDDC(qdev_new(TYPE_I2CDDC)); - i2c_set_slave_address(I2C_SLAVE(ddc), 0x50); + i2c_slave_set_address(I2C_SLAVE(ddc), 0x50); qdev_realize_and_unref(DEVICE(ddc), BUS(s->i2c_bus), &error_abort); =20 /* mmio */ diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 4fd6aeb18b5..2bb7a5441ad 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -1253,7 +1253,7 @@ static void xlnx_dp_init(Object *obj) object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd)); =20 s->edid =3D I2CDDC(qdev_new("i2c-ddc")); - i2c_set_slave_address(I2C_SLAVE(s->edid), 0x50); + i2c_slave_set_address(I2C_SLAVE(s->edid), 0x50); object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid)); =20 fifo8_create(&s->rx_fifo, 16); diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 27a66df7f34..6af24c9e797 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -66,7 +66,7 @@ I2CBus *i2c_init_bus(DeviceState *parent, const char *nam= e) return bus; } =20 -void i2c_set_slave_address(I2CSlave *dev, uint8_t address) +void i2c_slave_set_address(I2CSlave *dev, uint8_t address) { dev->address =3D address; } diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c index 2e02e1c4faa..9792583fea7 100644 --- a/hw/i2c/imx_i2c.c +++ b/hw/i2c/imx_i2c.c @@ -171,7 +171,7 @@ static void imx_i2c_write(void *opaque, hwaddr offset, switch (offset) { case IADR_ADDR: s->iadr =3D value & IADR_MASK; - /* i2c_set_slave_address(s->bus, (uint8_t)s->iadr); */ + /* i2c_slave_set_address(s->bus, (uint8_t)s->iadr); */ break; case IFDR_ADDR: s->ifdr =3D value & IFDR_MASK; --=20 2.31.1