On 6/22/20 8:34 PM, Philippe Mathieu-Daudé wrote:
> The PCA9552 device does not expose LEDs, but simple pins
> to connnect LEDs to. To be clearer with the device model,
> rename 'nr_leds' as 'pin_count'.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Cédric Le Goater <c...@kaod.org>
> ---
> include/hw/misc/pca9552.h | 2 +-
> hw/misc/pca9552.c | 10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/misc/pca9552.h b/include/hw/misc/pca9552.h
> index ebb43c63fe..bc5ed31087 100644
> --- a/include/hw/misc/pca9552.h
> +++ b/include/hw/misc/pca9552.h
> @@ -26,7 +26,7 @@ typedef struct PCA9552State {
>
> uint8_t regs[PCA9552_NR_REGS];
> uint8_t max_reg;
> - uint8_t nr_leds;
> + uint8_t pin_count;
> } PCA9552State;
>
> #endif
> diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c
> index cac729e35a..81da757a7e 100644
> --- a/hw/misc/pca9552.c
> +++ b/hw/misc/pca9552.c
> @@ -37,7 +37,7 @@ static void pca9552_update_pin_input(PCA9552State *s)
> {
> int i;
>
> - for (i = 0; i < s->nr_leds; i++) {
> + for (i = 0; i < s->pin_count; i++) {
> uint8_t input_reg = PCA9552_INPUT0 + (i / 8);
> uint8_t input_shift = (i % 8);
> uint8_t config = pca9552_pin_get_config(s, i);
> @@ -185,7 +185,7 @@ static void pca9552_get_led(Object *obj, Visitor *v,
> const char *name,
> error_setg(errp, "%s: error reading %s", __func__, name);
> return;
> }
> - if (led < 0 || led > s->nr_leds) {
> + if (led < 0 || led > s->pin_count) {
> error_setg(errp, "%s invalid led %s", __func__, name);
> return;
> }
> @@ -228,7 +228,7 @@ static void pca9552_set_led(Object *obj, Visitor *v,
> const char *name,
> error_setg(errp, "%s: error reading %s", __func__, name);
> return;
> }
> - if (led < 0 || led > s->nr_leds) {
> + if (led < 0 || led > s->pin_count) {
> error_setg(errp, "%s invalid led %s", __func__, name);
> return;
> }
> @@ -291,9 +291,9 @@ static void pca9552_initfn(Object *obj)
> * PCA955X device
> */
> s->max_reg = PCA9552_LS3;
> - s->nr_leds = 16;
> + s->pin_count = 16;
>
> - for (led = 0; led < s->nr_leds; led++) {
> + for (led = 0; led < s->pin_count; led++) {
> char *name;
>
> name = g_strdup_printf("led%d", led);
>
