From patchwork Mon Jul 26 15:39:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 485841 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3959946jao; Mon, 26 Jul 2021 09:00:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyo38wvYb3nrGGA56XIyFwCVf4D4Eh2nF9AWwtFlZmIMX0K1rDLBl3QMrJht8hAzmzFSgok X-Received: by 2002:a17:906:c30f:: with SMTP id s15mr8070277ejz.233.1627315221159; Mon, 26 Jul 2021 09:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627315221; cv=none; d=google.com; s=arc-20160816; b=OmEhpVkmfXhfxbsfM3ZNdy9EVSd4s3JSlXSyI/bAX2/I0PBMXgHkbuaKHLOo49Dep2 t6zqw7WigRd1DX75ujUujCC4va9LLroUj4DbFINC1Y4IPtKwHB/rVCe6rGE2oxTWa/Kr o8G5MQVCXDkdhe0w0D4p9GYTy//TtHObF34dvNiJC2pu6gkfbwSqvuMCQmuGxFmt/1ep pVzcO3t0GvQY3nX/q+1UFw4RWTM0eQx7UMlOBOoJJ8WfY/rYt9mrTV41mAmzVbltZU+r dGRONbasTpiZCTPgFh9D7md6aADYOUr83KtYwBncRnP3MznK1s7TiqoDuUVuB7BgLD0M 5anA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=108A7+XOitbzrSt0GRFRfdm/Dy/zOl2LtB5AHIHU7tA=; b=P+CSWJtfV6BPOITfW1Ugrliz6qpGelMpVkCN+u8SCo9ed0HdBP9ommOMDGXD4crn4t tf0ufe8KJmNdk6W/Bg76Lsj0AQIIjIPTeMtkp3cWzrP0rw/TKGyMC6b6ixJWatQwFBCK uXEkETXMNIZKSwFVhOhpXCEdPrijvx2+rcGXA2oWlapJ8rQwKXzHGLu/sTJzMht7D11k GY9NK2TnhV0i5FWNxF1vFUicN56vUgQfpMakpEo6TuEIjNXLFxfdZGuDjLZ2jW5xV3Y1 MTzsFDK+Qlu5vGSDnnw80JaZN7qevLyeFGIDO0Krzrebq8Qkk3lAnhYp2u7bhEhZHtjF Pu6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xDFW9IQx; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g13si281527ejo.277.2021.07.26.09.00.20; Mon, 26 Jul 2021 09:00:21 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xDFW9IQx; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236782AbhGZPTf (ORCPT + 12 others); Mon, 26 Jul 2021 11:19:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:60752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236607AbhGZPTd (ORCPT ); Mon, 26 Jul 2021 11:19:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 78ECB60F70; Mon, 26 Jul 2021 16:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627315202; bh=ImrBO32MS2qKCVDbOawfWgCzi5qP45Uis/tZnRBB4Oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xDFW9IQxKQe1tFcloo7taszIYBmulY8iu1yX9fdTDbVfVIc89XoChWWVco3JkQgLd 3CcM/+10KZ3jlXhbWqHQ8MfvyuD/6jZphodfG7tU0MIXi6dGp3i+KjNlBE0LtSwj9/ Da6Tg+OTj9Iwls4BXcI81m7tUMMJ3auiFPzmu+Fw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Meerwald , Oleksandr Kravchenko , Linus Walleij , Jonathan Cameron , Sudip Mukherjee Subject: [PATCH 5.4 103/108] iio: accel: bma180: Use explicit member assignment Date: Mon, 26 Jul 2021 17:39:44 +0200 Message-Id: <20210726153834.981310767@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153831.696295003@linuxfoundation.org> References: <20210726153831.696295003@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij commit 9436abc40139503a7cea22a96437697d048f31c0 upstream This uses the C99 explicit .member assignment for the variant data in struct bma180_part_info. This makes it easier to understand and add new variants. Cc: Peter Meerwald Cc: Oleksandr Kravchenko Signed-off-by: Linus Walleij Signed-off-by: Jonathan Cameron Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- drivers/iio/accel/bma180.c | 68 +++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 24 deletions(-) --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -633,32 +633,52 @@ static const struct iio_chan_spec bma250 static const struct bma180_part_info bma180_part_info[] = { [BMA180] = { - bma180_channels, ARRAY_SIZE(bma180_channels), - bma180_scale_table, ARRAY_SIZE(bma180_scale_table), - bma180_bw_table, ARRAY_SIZE(bma180_bw_table), - BMA180_CTRL_REG0, BMA180_RESET_INT, - BMA180_CTRL_REG0, BMA180_SLEEP, - BMA180_BW_TCS, BMA180_BW, - BMA180_OFFSET_LSB1, BMA180_RANGE, - BMA180_TCO_Z, BMA180_MODE_CONFIG, BMA180_LOW_POWER, - BMA180_CTRL_REG3, BMA180_NEW_DATA_INT, - BMA180_RESET, - bma180_chip_config, - bma180_chip_disable, + .channels = bma180_channels, + .num_channels = ARRAY_SIZE(bma180_channels), + .scale_table = bma180_scale_table, + .num_scales = ARRAY_SIZE(bma180_scale_table), + .bw_table = bma180_bw_table, + .num_bw = ARRAY_SIZE(bma180_bw_table), + .int_reset_reg = BMA180_CTRL_REG0, + .int_reset_mask = BMA180_RESET_INT, + .sleep_reg = BMA180_CTRL_REG0, + .sleep_mask = BMA180_SLEEP, + .bw_reg = BMA180_BW_TCS, + .bw_mask = BMA180_BW, + .scale_reg = BMA180_OFFSET_LSB1, + .scale_mask = BMA180_RANGE, + .power_reg = BMA180_TCO_Z, + .power_mask = BMA180_MODE_CONFIG, + .lowpower_val = BMA180_LOW_POWER, + .int_enable_reg = BMA180_CTRL_REG3, + .int_enable_mask = BMA180_NEW_DATA_INT, + .softreset_reg = BMA180_RESET, + .chip_config = bma180_chip_config, + .chip_disable = bma180_chip_disable, }, [BMA250] = { - bma250_channels, ARRAY_SIZE(bma250_channels), - bma250_scale_table, ARRAY_SIZE(bma250_scale_table), - bma250_bw_table, ARRAY_SIZE(bma250_bw_table), - BMA250_INT_RESET_REG, BMA250_INT_RESET_MASK, - BMA250_POWER_REG, BMA250_SUSPEND_MASK, - BMA250_BW_REG, BMA250_BW_MASK, - BMA250_RANGE_REG, BMA250_RANGE_MASK, - BMA250_POWER_REG, BMA250_LOWPOWER_MASK, 1, - BMA250_INT_ENABLE_REG, BMA250_DATA_INTEN_MASK, - BMA250_RESET_REG, - bma250_chip_config, - bma250_chip_disable, + .channels = bma250_channels, + .num_channels = ARRAY_SIZE(bma250_channels), + .scale_table = bma250_scale_table, + .num_scales = ARRAY_SIZE(bma250_scale_table), + .bw_table = bma250_bw_table, + .num_bw = ARRAY_SIZE(bma250_bw_table), + .int_reset_reg = BMA250_INT_RESET_REG, + .int_reset_mask = BMA250_INT_RESET_MASK, + .sleep_reg = BMA250_POWER_REG, + .sleep_mask = BMA250_SUSPEND_MASK, + .bw_reg = BMA250_BW_REG, + .bw_mask = BMA250_BW_MASK, + .scale_reg = BMA250_RANGE_REG, + .scale_mask = BMA250_RANGE_MASK, + .power_reg = BMA250_POWER_REG, + .power_mask = BMA250_LOWPOWER_MASK, + .lowpower_val = 1, + .int_enable_reg = BMA250_INT_ENABLE_REG, + .int_enable_mask = BMA250_DATA_INTEN_MASK, + .softreset_reg = BMA250_RESET_REG, + .chip_config = bma250_chip_config, + .chip_disable = bma250_chip_disable, }, };