• Ben Hutchings's avatar
    mtd: m25p80,spi-nor: Fix module aliases for m25p80 · a5b7616c
    Ben Hutchings authored
    m25p80's device ID table is now spi_nor_ids, defined in spi-nor.  The
    MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but
    its use was also removed at the same time.  Now if m25p80 is built as
    a module it doesn't get the necessary aliases to be loaded
    automatically.
    
    A clean solution to this will involve defining the list of device
    IDs in spi-nor.h and removing struct spi_device_id from the spi-nor
    API, but this is quite a large change.
    
    As a quick fix suitable for stable, copy the device IDs back into
    m25p80.
    
    Fixes: 03e296f6 ("mtd: m25p80: use the SPI nor framework")
    Cc: <stable@vger.kernel.org> # 3.16.x: 32f1b7c8: mtd: move support for struct flash_platform_data into m25p80
    Cc: <stable@vger.kernel.org> # 3.16.x: 90e55b38: mtd: m25p80: get rid of spi_get_device_id
    Cc: <stable@vger.kernel.org> # 3.16.x: 70f3ce05: mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
    Cc: <stable@vger.kernel.org> # 3.16.x
    Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
    Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
    a5b7616c
spi-nor.c 31.5 KB