lkml.org 
[lkml]   [2021]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 16/48] mfd: ti_am335x_tscadc: Move the driver structure allocation earlier
    Date
    Allocating the driver structure should be done earlier in the probe so
    that we can used its members from the beginning.

    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    ---
    drivers/mfd/ti_am335x_tscadc.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
    index 53749a0a5722..2976028d2615 100644
    --- a/drivers/mfd/ti_am335x_tscadc.c
    +++ b/drivers/mfd/ti_am335x_tscadc.c
    @@ -125,6 +125,13 @@ static int ti_tscadc_probe(struct platform_device *pdev)
    int tsc_wires = 0, adc_channels = 0, total_channels;
    int readouts = 0;

    + /* Allocate memory for device */
    + tscadc = devm_kzalloc(&pdev->dev, sizeof(*tscadc), GFP_KERNEL);
    + if (!tscadc)
    + return -ENOMEM;
    +
    + tscadc->dev = &pdev->dev;
    +
    if (!pdev->dev.of_node) {
    dev_err(&pdev->dev, "Could not find valid DT data.\n");
    return -EINVAL;
    @@ -164,13 +171,6 @@ static int ti_tscadc_probe(struct platform_device *pdev)
    return -EINVAL;
    }

    - /* Allocate memory for device */
    - tscadc = devm_kzalloc(&pdev->dev, sizeof(*tscadc), GFP_KERNEL);
    - if (!tscadc)
    - return -ENOMEM;
    -
    - tscadc->dev = &pdev->dev;
    -
    err = platform_get_irq(pdev, 0);
    if (err < 0)
    return err;
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-10-15 10:17    [W:4.305 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site