scan.c (ad93a765c1834db031b5bf1c2baf2a50d0462ca4) scan.c (0794469da3f7b2093575cbdfc1108308dd3641ce)
1/*
2 * scan.c - support for transforming the ACPI namespace into individual objects
3 */
4
5#include <linux/module.h>
6#include <linux/init.h>
7#include <linux/kernel.h>
8#include <linux/acpi.h>

--- 95 unchanged lines hidden (view full) ---

104
105 if (acpi_bus_get_device(handle, &device))
106 return 0;
107
108 if (!device)
109 return 0;
110
111 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
1/*
2 * scan.c - support for transforming the ACPI namespace into individual objects
3 */
4
5#include <linux/module.h>
6#include <linux/init.h>
7#include <linux/kernel.h>
8#include <linux/acpi.h>

--- 95 unchanged lines hidden (view full) ---

104
105 if (acpi_bus_get_device(handle, &device))
106 return 0;
107
108 if (!device)
109 return 0;
110
111 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
112 "Hot-removing device %s...\n", device->dev.bus_id));
112 "Hot-removing device %s...\n", dev_name(&device->dev)));
113
113
114
115 if (acpi_bus_trim(device, 1)) {
116 printk(KERN_ERR PREFIX
117 "Removing device failed\n");
118 return -1;
119 }
120
121 /* power off device */
122 status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);

--- 332 unchanged lines hidden (view full) ---

455 }
456 }
457 if(!found) {
458 acpi_device_bus_id = new_bus_id;
459 strcpy(acpi_device_bus_id->bus_id, device->flags.hardware_id ? device->pnp.hardware_id : "device");
460 acpi_device_bus_id->instance_no = 0;
461 list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);
462 }
114 if (acpi_bus_trim(device, 1)) {
115 printk(KERN_ERR PREFIX
116 "Removing device failed\n");
117 return -1;
118 }
119
120 /* power off device */
121 status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);

--- 332 unchanged lines hidden (view full) ---

454 }
455 }
456 if(!found) {
457 acpi_device_bus_id = new_bus_id;
458 strcpy(acpi_device_bus_id->bus_id, device->flags.hardware_id ? device->pnp.hardware_id : "device");
459 acpi_device_bus_id->instance_no = 0;
460 list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);
461 }
463 sprintf(device->dev.bus_id, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
462 dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
464
465 if (device->parent) {
466 list_add_tail(&device->node, &device->parent->children);
467 list_add_tail(&device->g_list, &device->parent->g_list);
468 } else
469 list_add_tail(&device->g_list, &acpi_device_list);
470 if (device->wakeup.flags.valid)
471 list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);

--- 7 unchanged lines hidden (view full) ---

479 result = device_add(&device->dev);
480 if(result) {
481 dev_err(&device->dev, "Error adding device\n");
482 goto end;
483 }
484
485 result = acpi_device_setup_files(device);
486 if(result)
463
464 if (device->parent) {
465 list_add_tail(&device->node, &device->parent->children);
466 list_add_tail(&device->g_list, &device->parent->g_list);
467 } else
468 list_add_tail(&device->g_list, &acpi_device_list);
469 if (device->wakeup.flags.valid)
470 list_add_tail(&device->wakeup_list, &acpi_wakeup_device_list);

--- 7 unchanged lines hidden (view full) ---

478 result = device_add(&device->dev);
479 if(result) {
480 dev_err(&device->dev, "Error adding device\n");
481 goto end;
482 }
483
484 result = acpi_device_setup_files(device);
485 if(result)
487 printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n", device->dev.bus_id);
486 printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n",
487 dev_name(&device->dev));
488
489 device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
490 return 0;
491 end:
492 spin_lock(&acpi_device_lock);
493 if (device->parent) {
494 list_del(&device->node);
495 list_del(&device->g_list);

--- 542 unchanged lines hidden (view full) ---

1038 else if (ACPI_SUCCESS(acpi_dock_match(device)))
1039 cid_add = ACPI_DOCK_HID;
1040
1041 break;
1042 case ACPI_BUS_TYPE_POWER:
1043 hid = ACPI_POWER_HID;
1044 break;
1045 case ACPI_BUS_TYPE_PROCESSOR:
488
489 device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
490 return 0;
491 end:
492 spin_lock(&acpi_device_lock);
493 if (device->parent) {
494 list_del(&device->node);
495 list_del(&device->g_list);

--- 542 unchanged lines hidden (view full) ---

1038 else if (ACPI_SUCCESS(acpi_dock_match(device)))
1039 cid_add = ACPI_DOCK_HID;
1040
1041 break;
1042 case ACPI_BUS_TYPE_POWER:
1043 hid = ACPI_POWER_HID;
1044 break;
1045 case ACPI_BUS_TYPE_PROCESSOR:
1046 hid = ACPI_PROCESSOR_OBJECT_HID;
1046 hid = ACPI_PROCESSOR_HID;
1047 break;
1048 case ACPI_BUS_TYPE_SYSTEM:
1049 hid = ACPI_SYSTEM_HID;
1050 break;
1051 case ACPI_BUS_TYPE_THERMAL:
1052 hid = ACPI_THERMAL_HID;
1053 break;
1054 case ACPI_BUS_TYPE_POWER_BUTTON:

--- 557 unchanged lines hidden --- 		1047 break;
1048 case ACPI_BUS_TYPE_SYSTEM:
1049 hid = ACPI_SYSTEM_HID;
1050 break;
1051 case ACPI_BUS_TYPE_THERMAL:
1052 hid = ACPI_THERMAL_HID;
1053 break;
1054 case ACPI_BUS_TYPE_POWER_BUTTON:

--- 557 unchanged lines hidden ---