Commit 09a736b8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Remove usage of struct device.name from ide core

parent e6d65601
...@@ -648,7 +648,6 @@ static void hwif_register (ide_hwif_t *hwif) ...@@ -648,7 +648,6 @@ static void hwif_register (ide_hwif_t *hwif)
{ {
/* register with global device tree */ /* register with global device tree */
strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE); strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE);
snprintf(hwif->gendev.name,DEVICE_NAME_SIZE,"IDE Controller");
hwif->gendev.driver_data = hwif; hwif->gendev.driver_data = hwif;
if (hwif->pci_dev) if (hwif->pci_dev)
hwif->gendev.parent = &hwif->pci_dev->dev; hwif->gendev.parent = &hwif->pci_dev->dev;
...@@ -1217,8 +1216,6 @@ static void init_gendisk (ide_hwif_t *hwif) ...@@ -1217,8 +1216,6 @@ static void init_gendisk (ide_hwif_t *hwif)
ide_add_generic_settings(drive); ide_add_generic_settings(drive);
snprintf(drive->gendev.bus_id,BUS_ID_SIZE,"%u.%u", snprintf(drive->gendev.bus_id,BUS_ID_SIZE,"%u.%u",
hwif->index,unit); hwif->index,unit);
snprintf(drive->gendev.name,DEVICE_NAME_SIZE,
"%s","IDE Drive");
drive->gendev.parent = &hwif->gendev; drive->gendev.parent = &hwif->gendev;
drive->gendev.bus = &ide_bus_type; drive->gendev.bus = &ide_bus_type;
drive->gendev.driver_data = drive; drive->gendev.driver_data = drive;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment