On Mon, Jan 15, 2018 at 07:42:09PM -0800, Darren Hart wrote: > To follow this email, are two patches which are minor incremental > cleanups, which I'd appreciate your review of before I push them to > testing.
>From ccfc9b138034b5ccd89da1d938e9241eaeb4dabf Mon Sep 17 00:00:00 2001 Message-Id: <ccfc9b138034b5ccd89da1d938e9241eaeb4dabf.1516073719.git.dvh...@infradead.org> In-Reply-To: <2c5d26ee913e0f5f7d13c559d85e8da7e4ddcdab.1516073719.git.dvh...@infradead.org> References: <2c5d26ee913e0f5f7d13c559d85e8da7e4ddcdab.1516073719.git.dvh...@infradead.org> From: "Darren Hart (VMware)" <[email protected]> Date: Mon, 15 Jan 2018 19:28:10 -0800 Subject: [PATCH 2/2] platform/mellanox: mlxreg-hotplug: Cleanup local variable declarations Make the local variable declarations more consistent throughout the driver. Separate inline initial assignments when it cleans up the declaration block. Signed-off-by: Darren Hart (VMware) <[email protected]> Cc: Vadim Pasternak <[email protected]> --- drivers/platform/mellanox/mlxreg-hotplug.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/platform/mellanox/mlxreg-hotplug.c b/drivers/platform/mellanox/mlxreg-hotplug.c index 78056f7..7cf7c17 100644 --- a/drivers/platform/mellanox/mlxreg-hotplug.c +++ b/drivers/platform/mellanox/mlxreg-hotplug.c @@ -361,17 +361,18 @@ mlxreg_hotplug_health_work_helper(struct mlxreg_hotplug_priv_data *priv, */ static void mlxreg_hotplug_work_handler(struct work_struct *work) { - struct mlxreg_hotplug_priv_data *priv = container_of(work, - struct mlxreg_hotplug_priv_data, dwork_irq.work); struct mlxreg_core_hotplug_platform_data *pdata; + struct mlxreg_hotplug_priv_data *priv; struct mlxreg_core_item *item; - unsigned long flags; u32 regval, aggr_asserted; - int i; - int ret; + unsigned long flags; + int i, ret; + priv = container_of(work, struct mlxreg_hotplug_priv_data, + dwork_irq.work); pdata = dev_get_platdata(&priv->pdev->dev); item = pdata->items; + /* Mask aggregation event. */ ret = regmap_write(priv->regmap, pdata->cell + MLXREG_HOTPLUG_AGGR_MASK_OFF, 0); @@ -431,8 +432,7 @@ static int mlxreg_hotplug_set_irq(struct mlxreg_hotplug_priv_data *priv) { struct mlxreg_core_hotplug_platform_data *pdata; struct mlxreg_core_item *item; - int i; - int ret; + int i, ret; pdata = dev_get_platdata(&priv->pdev->dev); item = pdata->items; @@ -520,8 +520,9 @@ static void mlxreg_hotplug_unset_irq(struct mlxreg_hotplug_priv_data *priv) static irqreturn_t mlxreg_hotplug_irq_handler(int irq, void *dev) { - struct mlxreg_hotplug_priv_data *priv = - (struct mlxreg_hotplug_priv_data *)dev; + struct mlxreg_hotplug_priv_data *priv; + + priv = (struct mlxreg_hotplug_priv_data *)dev; /* Schedule work task for immediate execution.*/ schedule_delayed_work(&priv->dwork_irq, 0); -- 2.9.4
