Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 91695
b: refs/heads/master
c: 66bef8c
h: refs/heads/master
i:
  91693: f08ac84
  91691: c6a4a6d
  91687: a55b2a2
  91679: 7b1d25e
v: v3
  • Loading branch information
Harvey Harrison authored and Greg Kroah-Hartman committed Apr 21, 2008
1 parent e2d5ddf commit f5620d4
Show file tree
Hide file tree
Showing 40 changed files with 488 additions and 488 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ca99eb8c2d56bdfff0161388b81e641f4e039b3f
refs/heads/master: 66bef8c059015ba2b36bb5759080336feb01e680
24 changes: 12 additions & 12 deletions trunk/drivers/pci/hotplug/acpi_pcihp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#define MY_NAME "acpi_pcihp"

#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)
#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __func__ , ## arg); } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
#define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
Expand Down Expand Up @@ -71,7 +71,7 @@ decode_type0_hpx_record(union acpi_object *record, struct hotplug_params *hpx)
default:
printk(KERN_WARNING
"%s: Type 0 Revision %d record not supported\n",
__FUNCTION__, revision);
__func__, revision);
return AE_ERROR;
}
return AE_OK;
Expand Down Expand Up @@ -100,7 +100,7 @@ decode_type1_hpx_record(union acpi_object *record, struct hotplug_params *hpx)
default:
printk(KERN_WARNING
"%s: Type 1 Revision %d record not supported\n",
__FUNCTION__, revision);
__func__, revision);
return AE_ERROR;
}
return AE_OK;
Expand Down Expand Up @@ -142,7 +142,7 @@ decode_type2_hpx_record(union acpi_object *record, struct hotplug_params *hpx)
default:
printk(KERN_WARNING
"%s: Type 2 Revision %d record not supported\n",
__FUNCTION__, revision);
__func__, revision);
return AE_ERROR;
}
return AE_OK;
Expand Down Expand Up @@ -203,7 +203,7 @@ acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)
break;
default:
printk(KERN_ERR "%s: Type %d record not supported\n",
__FUNCTION__, type);
__func__, type);
status = AE_ERROR;
goto exit;
}
Expand Down Expand Up @@ -235,7 +235,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
ret_buf.pointer = kmalloc (ret_buf.length, GFP_KERNEL);
if (!ret_buf.pointer) {
printk(KERN_ERR "%s:%s alloc for _HPP fail\n",
__FUNCTION__, (char *)string.pointer);
__func__, (char *)string.pointer);
kfree(string.pointer);
return AE_NO_MEMORY;
}
Expand All @@ -245,7 +245,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
break;
default:
if (ACPI_FAILURE(status)) {
pr_debug("%s:%s _HPP fail=0x%x\n", __FUNCTION__,
pr_debug("%s:%s _HPP fail=0x%x\n", __func__,
(char *)string.pointer, status);
kfree(string.pointer);
return status;
Expand All @@ -254,7 +254,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)

ext_obj = (union acpi_object *) ret_buf.pointer;
if (ext_obj->type != ACPI_TYPE_PACKAGE) {
printk(KERN_ERR "%s:%s _HPP obj not a package\n", __FUNCTION__,
printk(KERN_ERR "%s:%s _HPP obj not a package\n", __func__,
(char *)string.pointer);
status = AE_ERROR;
goto free_and_return;
Expand All @@ -270,7 +270,7 @@ acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
break;
default:
printk(KERN_ERR "%s:%s _HPP obj type incorrect\n",
__FUNCTION__, (char *)string.pointer);
__func__, (char *)string.pointer);
status = AE_ERROR;
goto free_and_return;
}
Expand Down Expand Up @@ -311,12 +311,12 @@ acpi_status acpi_run_oshp(acpi_handle handle)
if (ACPI_FAILURE(status))
if (status != AE_NOT_FOUND)
printk(KERN_ERR "%s:%s OSHP fails=0x%x\n",
__FUNCTION__, (char *)string.pointer, status);
__func__, (char *)string.pointer, status);
else
dbg("%s:%s OSHP not found\n",
__FUNCTION__, (char *)string.pointer);
__func__, (char *)string.pointer);
else
pr_debug("%s:%s OSHP passes\n", __FUNCTION__,
pr_debug("%s:%s OSHP passes\n", __func__,
(char *)string.pointer);

kfree(string.pointer);
Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/pci/hotplug/acpiphp_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
{
struct slot *slot = hotplug_slot->private;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

/* enable the specified slot */
return acpiphp_enable_slot(slot->acpi_slot);
Expand All @@ -156,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
struct slot *slot = hotplug_slot->private;
int retval;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

/* disable the specified slot */
retval = acpiphp_disable_slot(slot->acpi_slot);
Expand All @@ -179,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
{
int retval = -ENODEV;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

if (attention_info && try_module_get(attention_info->owner)) {
retval = attention_info->set_attn(hotplug_slot, status);
Expand All @@ -202,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
struct slot *slot = hotplug_slot->private;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

*value = acpiphp_get_power_status(slot->acpi_slot);

Expand All @@ -224,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
int retval = -EINVAL;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

if (attention_info && try_module_get(attention_info->owner)) {
retval = attention_info->get_attn(hotplug_slot, value);
Expand All @@ -247,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
struct slot *slot = hotplug_slot->private;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

*value = acpiphp_get_latch_status(slot->acpi_slot);

Expand All @@ -267,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
struct slot *slot = hotplug_slot->private;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

*value = acpiphp_get_adapter_status(slot->acpi_slot);

Expand All @@ -284,7 +284,7 @@ static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)
{
struct slot *slot = hotplug_slot->private;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

*value = acpiphp_get_address(slot->acpi_slot);

Expand Down Expand Up @@ -318,7 +318,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
{
struct slot *slot = hotplug_slot->private;

dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);

kfree(slot->hotplug_slot);
kfree(slot);
Expand Down
38 changes: 19 additions & 19 deletions trunk/drivers/pci/hotplug/acpiphp_glue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static void decode_hpp(struct acpiphp_bridge *bridge)
/* use default numbers */
printk(KERN_WARNING
"%s: Could not get hotplug parameters. Use defaults\n",
__FUNCTION__);
__func__);
bridge->hpp.t0 = &bridge->hpp.type0_data;
bridge->hpp.t0->revision = 0;
bridge->hpp.t0->cache_line_size = 0x10;
Expand Down Expand Up @@ -534,7 +534,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)

status = acpi_evaluate_integer(handle, "_ADR", NULL, &tmp);
if (ACPI_FAILURE(status)) {
dbg("%s: _ADR evaluation failure\n", __FUNCTION__);
dbg("%s: _ADR evaluation failure\n", __func__);
return AE_OK;
}

Expand Down Expand Up @@ -578,7 +578,7 @@ static int add_bridge(acpi_handle handle)
if (ACPI_SUCCESS(status)) {
status = acpi_evaluate_integer(handle, "_STA", NULL, &tmp);
if (ACPI_FAILURE(status)) {
dbg("%s: _STA evaluation failure\n", __FUNCTION__);
dbg("%s: _STA evaluation failure\n", __func__);
return 0;
}
if ((tmp & ACPI_STA_FUNCTIONING) == 0)
Expand Down Expand Up @@ -928,10 +928,10 @@ static int power_on_slot(struct acpiphp_slot *slot)
func = list_entry(l, struct acpiphp_func, sibling);

if (func->flags & FUNC_HAS_PS0) {
dbg("%s: executing _PS0\n", __FUNCTION__);
dbg("%s: executing _PS0\n", __func__);
status = acpi_evaluate_object(func->handle, "_PS0", NULL, NULL);
if (ACPI_FAILURE(status)) {
warn("%s: _PS0 failed\n", __FUNCTION__);
warn("%s: _PS0 failed\n", __func__);
retval = -1;
goto err_exit;
} else
Expand Down Expand Up @@ -966,7 +966,7 @@ static int power_off_slot(struct acpiphp_slot *slot)
if (func->flags & FUNC_HAS_PS3) {
status = acpi_evaluate_object(func->handle, "_PS3", NULL, NULL);
if (ACPI_FAILURE(status)) {
warn("%s: _PS3 failed\n", __FUNCTION__);
warn("%s: _PS3 failed\n", __func__);
retval = -1;
goto err_exit;
} else
Expand Down Expand Up @@ -1300,7 +1300,7 @@ int acpiphp_eject_slot(struct acpiphp_slot *slot)

status = acpi_evaluate_object(func->handle, "_EJ0", &arg_list, NULL);
if (ACPI_FAILURE(status)) {
warn("%s: _EJ0 failed\n", __FUNCTION__);
warn("%s: _EJ0 failed\n", __func__);
return -1;
} else
break;
Expand Down Expand Up @@ -1349,7 +1349,7 @@ static int acpiphp_check_bridge(struct acpiphp_bridge *bridge)
}
}

dbg("%s: %d enabled, %d disabled\n", __FUNCTION__, enabled, disabled);
dbg("%s: %d enabled, %d disabled\n", __func__, enabled, disabled);

err_exit:
return retval;
Expand Down Expand Up @@ -1527,7 +1527,7 @@ check_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
if (bridge) {
acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
dbg("%s: re-enumerating slots under %s\n",
__FUNCTION__, objname);
__func__, objname);
acpiphp_check_bridge(bridge);
}
return AE_OK ;
Expand Down Expand Up @@ -1572,10 +1572,10 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont
switch (type) {
case ACPI_NOTIFY_BUS_CHECK:
/* bus re-enumerate */
dbg("%s: Bus check notify on %s\n", __FUNCTION__, objname);
dbg("%s: Bus check notify on %s\n", __func__, objname);
if (bridge) {
dbg("%s: re-enumerating slots under %s\n",
__FUNCTION__, objname);
__func__, objname);
acpiphp_check_bridge(bridge);
}
if (num_sub_bridges)
Expand All @@ -1585,18 +1585,18 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *cont

case ACPI_NOTIFY_DEVICE_CHECK:
/* device check */
dbg("%s: Device check notify on %s\n", __FUNCTION__, objname);
dbg("%s: Device check notify on %s\n", __func__, objname);
acpiphp_check_bridge(bridge);
break;

case ACPI_NOTIFY_DEVICE_WAKE:
/* wake event */
dbg("%s: Device wake notify on %s\n", __FUNCTION__, objname);
dbg("%s: Device wake notify on %s\n", __func__, objname);
break;

case ACPI_NOTIFY_EJECT_REQUEST:
/* request device eject */
dbg("%s: Device eject notify on %s\n", __FUNCTION__, objname);
dbg("%s: Device eject notify on %s\n", __func__, objname);
if ((bridge->type != BRIDGE_TYPE_HOST) &&
(bridge->flags & BRIDGE_HAS_EJ0)) {
struct acpiphp_slot *slot;
Expand Down Expand Up @@ -1649,24 +1649,24 @@ static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *contex
switch (type) {
case ACPI_NOTIFY_BUS_CHECK:
/* bus re-enumerate */
dbg("%s: Bus check notify on %s\n", __FUNCTION__, objname);
dbg("%s: Bus check notify on %s\n", __func__, objname);
acpiphp_enable_slot(func->slot);
break;

case ACPI_NOTIFY_DEVICE_CHECK:
/* device check : re-enumerate from parent bus */
dbg("%s: Device check notify on %s\n", __FUNCTION__, objname);
dbg("%s: Device check notify on %s\n", __func__, objname);
acpiphp_check_bridge(func->slot->bridge);
break;

case ACPI_NOTIFY_DEVICE_WAKE:
/* wake event */
dbg("%s: Device wake notify on %s\n", __FUNCTION__, objname);
dbg("%s: Device wake notify on %s\n", __func__, objname);
break;

case ACPI_NOTIFY_EJECT_REQUEST:
/* request device eject */
dbg("%s: Device eject notify on %s\n", __FUNCTION__, objname);
dbg("%s: Device eject notify on %s\n", __func__, objname);
if (!(acpiphp_disable_slot(func->slot)))
acpiphp_eject_slot(func->slot);
break;
Expand Down Expand Up @@ -1796,7 +1796,7 @@ int acpiphp_enable_slot(struct acpiphp_slot *slot)
if (retval)
power_off_slot(slot);
} else {
dbg("%s: Slot status is not ACPI_STA_ALL\n", __FUNCTION__);
dbg("%s: Slot status is not ACPI_STA_ALL\n", __func__);
power_off_slot(slot);
}

Expand Down
Loading

0 comments on commit f5620d4

Please sign in to comment.