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 <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Subject: firewire: struct device - replace bus_id with dev_name(), dev_set_name()
CC: Stefan Richter <[email protected]>
Signed-Off-By: Kay Sievers <[email protected]>
---
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 3fccdd4..6b9be42 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -587,8 +587,7 @@ static void create_units(struct fw_device *device)
unit->device.bus = &fw_bus_type;
unit->device.type = &fw_unit_type;
unit->device.parent = &device->device;
- snprintf(unit->device.bus_id, sizeof(unit->device.bus_id),
- "%s.%d", device->device.bus_id, i++);
+ dev_set_name(&unit->device, "%s.%d", dev_name(&device->device), i++);
init_fw_attribute_group(&unit->device,
fw_unit_attributes,
@@ -711,8 +710,7 @@ static void fw_device_init(struct work_struct *work)
device->device.type = &fw_device_type;
device->device.parent = device->card->device;
device->device.devt = MKDEV(fw_cdev_major, minor);
- snprintf(device->device.bus_id, sizeof(device->device.bus_id),
- "fw%d", minor);
+ dev_set_name(&device->device, "fw%d", minor);
init_fw_attribute_group(&device->device,
fw_device_attributes,
@@ -741,13 +739,13 @@ static void fw_device_init(struct work_struct *work)
if (device->config_rom_retries)
fw_notify("created device %s: GUID %08x%08x, S%d00, "
"%d config ROM retries\n",
- device->device.bus_id,
+ dev_name(&device->device),
device->config_rom[3], device->config_rom[4],
1 << device->max_speed,
device->config_rom_retries);
else
fw_notify("created device %s: GUID %08x%08x, S%d00\n",
- device->device.bus_id,
+ dev_name(&device->device),
device->config_rom[3], device->config_rom[4],
1 << device->max_speed);
device->config_rom_retries = 0;
@@ -883,12 +881,12 @@ static void fw_device_refresh(struct work_struct *work)
FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
goto gone;
- fw_notify("refreshed device %s\n", device->device.bus_id);
+ fw_notify("refreshed device %s\n", dev_name(&device->device));
device->config_rom_retries = 0;
goto out;
give_up:
- fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
+ fw_notify("giving up on refresh of device %s\n", dev_name(&device->device));
gone:
atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
fw_device_shutdown(work);
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 251416f..964c697 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -2454,7 +2454,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
goto fail_self_id;
fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
- dev->dev.bus_id, version >> 16, version & 0xff);
+ dev_name(&dev->dev), version >> 16, version & 0xff);
return 0;
fail_self_id:
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index ef0b9b4..0a87127 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -1119,7 +1119,7 @@ static int sbp2_probe(struct device *dev)
tgt->unit = unit;
kref_init(&tgt->kref);
INIT_LIST_HEAD(&tgt->lu_list);
- tgt->bus_id = unit->device.bus_id;
+ tgt->bus_id = dev_name(&unit->device);
tgt->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
if (fw_device_enable_phys_dma(device) < 0)
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".
>
> 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 <[email protected]>
> Acked-by: Greg Kroah-Hartman <[email protected]>
> Subject: firewire: struct device - replace bus_id with dev_name(), dev_set_name()
>
> CC: Stefan Richter <[email protected]>
> Signed-Off-By: Kay Sievers <[email protected]>
> ---
Committed to linux1394-2.6.git. Thanks.
>
>
> diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
> index 3fccdd4..6b9be42 100644
> --- a/drivers/firewire/fw-device.c
> +++ b/drivers/firewire/fw-device.c
> @@ -587,8 +587,7 @@ static void create_units(struct fw_device *device)
> unit->device.bus = &fw_bus_type;
> unit->device.type = &fw_unit_type;
> unit->device.parent = &device->device;
> - snprintf(unit->device.bus_id, sizeof(unit->device.bus_id),
> - "%s.%d", device->device.bus_id, i++);
> + dev_set_name(&unit->device, "%s.%d", dev_name(&device->device), i++);
>
> init_fw_attribute_group(&unit->device,
> fw_unit_attributes,
> @@ -711,8 +710,7 @@ static void fw_device_init(struct work_struct *work)
> device->device.type = &fw_device_type;
> device->device.parent = device->card->device;
> device->device.devt = MKDEV(fw_cdev_major, minor);
> - snprintf(device->device.bus_id, sizeof(device->device.bus_id),
> - "fw%d", minor);
> + dev_set_name(&device->device, "fw%d", minor);
>
> init_fw_attribute_group(&device->device,
> fw_device_attributes,
> @@ -741,13 +739,13 @@ static void fw_device_init(struct work_struct *work)
> if (device->config_rom_retries)
> fw_notify("created device %s: GUID %08x%08x, S%d00, "
> "%d config ROM retries\n",
> - device->device.bus_id,
> + dev_name(&device->device),
> device->config_rom[3], device->config_rom[4],
> 1 << device->max_speed,
> device->config_rom_retries);
> else
> fw_notify("created device %s: GUID %08x%08x, S%d00\n",
> - device->device.bus_id,
> + dev_name(&device->device),
> device->config_rom[3], device->config_rom[4],
> 1 << device->max_speed);
> device->config_rom_retries = 0;
> @@ -883,12 +881,12 @@ static void fw_device_refresh(struct work_struct *work)
> FW_DEVICE_RUNNING) == FW_DEVICE_SHUTDOWN)
> goto gone;
>
> - fw_notify("refreshed device %s\n", device->device.bus_id);
> + fw_notify("refreshed device %s\n", dev_name(&device->device));
> device->config_rom_retries = 0;
> goto out;
>
> give_up:
> - fw_notify("giving up on refresh of device %s\n", device->device.bus_id);
> + fw_notify("giving up on refresh of device %s\n", dev_name(&device->device));
> gone:
> atomic_set(&device->state, FW_DEVICE_SHUTDOWN);
> fw_device_shutdown(work);
> diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
> index 251416f..964c697 100644
> --- a/drivers/firewire/fw-ohci.c
> +++ b/drivers/firewire/fw-ohci.c
> @@ -2454,7 +2454,7 @@ pci_probe(struct pci_dev *dev, const struct pci_device_id *ent)
> goto fail_self_id;
>
> fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
> - dev->dev.bus_id, version >> 16, version & 0xff);
> + dev_name(&dev->dev), version >> 16, version & 0xff);
> return 0;
>
> fail_self_id:
> diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
> index ef0b9b4..0a87127 100644
> --- a/drivers/firewire/fw-sbp2.c
> +++ b/drivers/firewire/fw-sbp2.c
> @@ -1119,7 +1119,7 @@ static int sbp2_probe(struct device *dev)
> tgt->unit = unit;
> kref_init(&tgt->kref);
> INIT_LIST_HEAD(&tgt->lu_list);
> - tgt->bus_id = unit->device.bus_id;
> + tgt->bus_id = dev_name(&unit->device);
> tgt->guid = (u64)device->config_rom[3] << 32 | device->config_rom[4];
>
> if (fw_device_enable_phys_dma(device) < 0)
>
>
--
Stefan Richter
-=====-==--- =-=- =====
http://arcgraph.de/sr/