uwb: struct device - replace bus_id with dev_name(), dev_set_name() - Kernel

This is a discussion on uwb: struct device - replace bus_id with dev_name(), dev_set_name() - Kernel ; This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: uwb: struct device - replace bus_id with dev_name(), dev_set_name()

  1. uwb: struct device - replace bus_id with dev_name(), dev_set_name()

    This patch is part of a larger patch series which will remove
    the "char bus_id[20]" name string from struct device. The device
    name is managed in the kobject anyway, and without any size
    limitation, and just needlessly copied into "struct device".

    To set and read the device name dev_name(dev) and dev_set_name(dev)
    must be used. If your code uses static kobjects, which it shouldn't
    do, "const char *init_name" can be used to statically provide the
    name the registered device should have. At registration time, the
    init_name field is cleared, to enforce the use of dev_name(dev) to
    access the device name at a later time.

    We need to get rid of all occurrences of bus_id in the entire tree
    to be able to enable the new interface. Please apply this patch,
    and possibly convert any remaining remaining occurrences of bus_id.

    We want to submit a patch to -next, which will remove bus_id from
    "struct device", to find the remaining pieces to convert, and finally
    switch over to the new api, which will remove the 20 bytes array
    and does no longer have a size limitation.

    Thanks,
    Kay


    From: Kay Sievers
    Subject: uwb: struct device - replace bus_id with dev_name(), dev_set_name()

    Cc: David Vrabel
    Acked-by: Greg Kroah-Hartman
    Signed-Off-By: Kay Sievers
    ---


    diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c
    index aa44e1c..53207e1 100644
    --- a/drivers/uwb/umc-dev.c
    +++ b/drivers/uwb/umc-dev.c
    @@ -31,8 +31,7 @@ struct umc_dev *umc_device_create(struct device *parent, int n)

    umc = kzalloc(sizeof(struct umc_dev), GFP_KERNEL);
    if (umc) {
    - snprintf(umc->dev.bus_id, sizeof(umc->dev.bus_id), "%s-%d",
    - parent->bus_id, n);
    + dev_set_name(&umc->dev, "%s-%d", dev_name(parent), n);
    umc->dev.parent = parent;
    umc->dev.bus = &umc_bus_type;
    umc->dev.release = umc_device_release;
    diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c
    index 3df2388..e626467 100644
    --- a/drivers/uwb/whci.c
    +++ b/drivers/uwb/whci.c
    @@ -111,7 +111,7 @@ static int whci_add_cap(struct whci_card *card, int n)
    + UWBCAPDATA_TO_OFFSET(capdata);
    umc->resource.end = umc->resource.start
    + (n == 0 ? 0x20 : UWBCAPDATA_TO_SIZE(capdata)) - 1;
    - umc->resource.name = umc->dev.bus_id;
    + umc->resource.name = dev_name(&umc->dev);
    umc->resource.flags = card->pci->resource[bar].flags;
    umc->resource.parent = &card->pci->resource[bar];
    umc->irq = card->pci->irq;
    diff --git a/include/linux/uwb/debug.h b/include/linux/uwb/debug.h
    index a86a73f..67a2405 100644
    --- a/include/linux/uwb/debug.h
    +++ b/include/linux/uwb/debug.h
    @@ -60,7 +60,7 @@ do { \
    snprintf(__head, sizeof(__head), \
    "%s %s: ", \
    dev_driver_string(__dev), \
    - __dev->bus_id); \
    + dev_name(__dev)); \
    } \
    printk(KERN_ERR "%s%s" _tag ": " f, __head, \
    __func__, ## a); \


    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: uwb: struct device - replace bus_id with dev_name(), dev_set_name()

    Kay Sievers wrote:
    > This patch is part of a larger patch series which will remove
    > the "char bus_id[20]" name string from struct device. The device
    > name is managed in the kobject anyway, and without any size
    > limitation, and just needlessly copied into "struct device".


    Applied, thanks.

    David
    --
    David Vrabel, Senior Software Engineer, Drivers
    CSR, Churchill House, Cambridge Business Park, Tel: +44 (0)1223 692562
    Cowley Road, Cambridge, CB4 0WZ http://www.csr.com/
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread