lkml.org 
[lkml]   [2023]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 2/3] pinctrl: mcp23s08_spi: Simplify probe()
    Date
    Simpilfy probe() by replacing device_get_match_data() and ID lookup for
    retrieving match data by spi_get_device_match_data().

    While at it, replace data type of variable type from 'int'->'unsigned int'
    and declare variables following a reverse christmas tree order.

    Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    v3->v4:
    * No change.
    v2->v3:
    * Added Rb tag from Andy
    * Reordered the patch.
    v2:
    * New patch.
    ---
    drivers/pinctrl/pinctrl-mcp23s08_spi.c | 13 ++++---------
    1 file changed, 4 insertions(+), 9 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-mcp23s08_spi.c b/drivers/pinctrl/pinctrl-mcp23s08_spi.c
    index ea059b9c5542..caf528284d07 100644
    --- a/drivers/pinctrl/pinctrl-mcp23s08_spi.c
    +++ b/drivers/pinctrl/pinctrl-mcp23s08_spi.c
    @@ -143,22 +143,17 @@ static int mcp23s08_spi_regmap_init(struct mcp23s08 *mcp, struct device *dev,

    static int mcp23s08_probe(struct spi_device *spi)
    {
    - struct device *dev = &spi->dev;
    struct mcp23s08_driver_data *data;
    + struct device *dev = &spi->dev;
    unsigned long spi_present_mask;
    - const void *match;
    - unsigned int addr;
    unsigned int ngpio = 0;
    + unsigned int type;
    + unsigned int addr;
    int chips;
    - int type;
    int ret;
    u32 v;

    - match = device_get_match_data(dev);
    - if (match)
    - type = (int)(uintptr_t)match;
    - else
    - type = spi_get_device_id(spi)->driver_data;
    + type = (uintptr_t)spi_get_device_match_data(spi);

    ret = device_property_read_u32(dev, "microchip,spi-present-mask", &v);
    if (ret) {
    --
    2.25.1
    \
     
     \ /
      Last update: 2023-10-01 17:02    [W:8.068 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site