lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 396/846] misc: at25: Make driver OF independent again
    Date
    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    [ Upstream commit 5b557298d7d09cce04e0565a535fbca63661724a ]

    The commit f60e7074902a ("misc: at25: Make use of device property API")
    made a good job by enabling the driver for non-OF platforms, but the
    recent commit 604288bc6196 ("nvmem: eeprom: at25: fix type compiler warnings")
    brought that back.

    Restore greatness of the driver once again.

    Fixes: eab61fb1cc2e ("nvmem: eeprom: at25: fram discovery simplification")
    Fixes: fd307a4ad332 ("nvmem: prepare basics for FRAM support")
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Link: https://lore.kernel.org/r/20211125212729.86585-2-andriy.shevchenko@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/misc/eeprom/at25.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
    index b38978a3b3ffa..9193b812bc07e 100644
    --- a/drivers/misc/eeprom/at25.c
    +++ b/drivers/misc/eeprom/at25.c
    @@ -17,8 +17,6 @@
    #include <linux/spi/spi.h>
    #include <linux/spi/eeprom.h>
    #include <linux/property.h>
    -#include <linux/of.h>
    -#include <linux/of_device.h>
    #include <linux/math.h>

    /*
    @@ -380,13 +378,14 @@ static int at25_probe(struct spi_device *spi)
    int sr;
    u8 id[FM25_ID_LEN];
    u8 sernum[FM25_SN_LEN];
    + bool is_fram;
    int i;
    - const struct of_device_id *match;
    - bool is_fram = 0;

    - match = of_match_device(of_match_ptr(at25_of_match), &spi->dev);
    - if (match && !strcmp(match->compatible, "cypress,fm25"))
    - is_fram = 1;
    + err = device_property_match_string(&spi->dev, "compatible", "cypress,fm25");
    + if (err >= 0)
    + is_fram = true;
    + else
    + is_fram = false;

    at25 = devm_kzalloc(&spi->dev, sizeof(struct at25_data), GFP_KERNEL);
    if (!at25)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 04:09    [W:2.467 / U:0.820 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site