lkml.org 
[lkml]   [2008]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 01/04] MTD: handle pci_name() being const
    This changes the MTD core to handle pci_name() now returning a constant
    string.

    Cc: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/mtd/devices/block2mtd.c | 8 +++++---
    include/linux/mtd/map.h | 2 +-
    include/linux/mtd/mtd.h | 2 +-
    3 files changed, 7 insertions(+), 5 deletions(-)

    --- a/drivers/mtd/devices/block2mtd.c
    +++ b/drivers/mtd/devices/block2mtd.c
    @@ -241,6 +241,7 @@ static struct block2mtd_dev *add_device(
    {
    struct block_device *bdev;
    struct block2mtd_dev *dev;
    + char *name;

    if (!devname)
    return NULL;
    @@ -279,12 +280,13 @@ static struct block2mtd_dev *add_device(

    /* Setup the MTD structure */
    /* make the name contain the block device in */
    - dev->mtd.name = kmalloc(sizeof("block2mtd: ") + strlen(devname),
    + name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
    GFP_KERNEL);
    - if (!dev->mtd.name)
    + if (!name)
    goto devinit_err;

    - sprintf(dev->mtd.name, "block2mtd: %s", devname);
    + sprintf(name, "block2mtd: %s", devname);
    + dev->mtd.name = name;

    dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
    dev->mtd.erasesize = erase_size;
    --- a/include/linux/mtd/map.h
    +++ b/include/linux/mtd/map.h
    @@ -189,7 +189,7 @@ typedef union {
    */

    struct map_info {
    - char *name;
    + const char *name;
    unsigned long size;
    resource_size_t phys;
    #define NO_XIP (-1UL)
    --- a/include/linux/mtd/mtd.h
    +++ b/include/linux/mtd/mtd.h
    @@ -121,7 +121,7 @@ struct mtd_info {
    u_int32_t oobavail; // Available OOB bytes per block

    // Kernel-only stuff starts here.
    - char *name;
    + const char *name;
    int index;

    /* ecc layout structure pointer - read only ! */
    --


    \
     
     \ /
      Last update: 2008-07-02 22:29    [W:0.024 / U:0.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site