# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.685 -> 1.686
# drivers/hotplug/ibmphp_core.c 1.6 -> 1.7
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/18 greg@kroah.com 1.686
# PCI Hotplug: added speed status to the IBM driver.
# --------------------------------------------
#
diff -Nru a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c
--- a/drivers/hotplug/ibmphp_core.c Thu Sep 19 17:19:03 2002
+++ b/drivers/hotplug/ibmphp_core.c Thu Sep 19 17:19:03 2002
@@ -384,14 +384,15 @@
debug ("get_adapter_present - Exit rc[%d] hpcrc[%x] value[%x]\n", rc, hpcrc, *value);
return rc;
}
-/*
-static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, u8 * value)
+
+static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
{
int rc = -ENODEV;
struct slot *pslot;
u8 mode = 0;
- debug ("get_max_bus_speed - Entry hotplug_slot[%lx] pvalue[%lx]\n", (ulong)hotplug_slot, (ulong) value);
+ debug ("%s - Entry hotplug_slot[%p] pvalue[%p]\n", __FUNCTION__,
+ hotplug_slot, value);
ibmphp_lock_operations ();
@@ -413,25 +414,26 @@
*value = pslot->supported_speed + 0x01;
break;
default:
-*/ /* Note (will need to change): there would be soon 256, 512 also */
-/* rc = -ENODEV;
+ /* Note (will need to change): there would be soon 256, 512 also */
+ rc = -ENODEV;
}
}
} else
rc = -ENODEV;
ibmphp_unlock_operations ();
- debug ("get_max_bus_speed - Exit rc[%d] value[%x]\n", rc, *value);
+ debug ("%s - Exit rc[%d] value[%x]\n", __FUNCTION__, rc, *value);
return rc;
}
-static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, u8 * value)
+static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
{
int rc = -ENODEV;
struct slot *pslot;
u8 mode = 0;
- debug ("get_cur_bus_speed - Entry hotplug_slot[%lx] pvalue[%lx]\n", (ulong)hotplug_slot, (ulong) value);
+ debug ("%s - Entry hotplug_slot[%p] pvalue[%p]\n", __FUNCTION__,
+ hotplug_slot, value);
ibmphp_lock_operations ();
@@ -458,8 +460,8 @@
*value += 0x01;
break;
default:
-*/ /* Note of change: there would also be 256, 512 soon */
-/* rc = -ENODEV;
+ /* Note of change: there would also be 256, 512 soon */
+ rc = -ENODEV;
}
}
}
@@ -467,10 +469,10 @@
rc = -ENODEV;
ibmphp_unlock_operations ();
- debug ("get_cur_bus_speed - Exit rc[%d] value[%x]\n", rc, *value);
+ debug ("%s - Exit rc[%d] value[%x]\n", __FUNCTION__, rc, *value);
return rc;
}
-
+/*
static int get_max_adapter_speed_1 (struct hotplug_slot *hotplug_slot, u8 * value, u8 flag)
{
int rc = -ENODEV;
@@ -1579,9 +1581,9 @@
.get_attention_status = get_attention_status,
.get_latch_status = get_latch_status,
.get_adapter_status = get_adapter_present,
-/* .get_max_bus_speed_status = get_max_bus_speed,
- .get_max_adapter_speed_status = get_max_adapter_speed,
- .get_cur_bus_speed_status = get_cur_bus_speed,
+ .get_max_bus_speed = get_max_bus_speed,
+ .get_cur_bus_speed = get_cur_bus_speed,
+/* .get_max_adapter_speed = get_max_adapter_speed,
.get_bus_name_status = get_bus_name,
*/
};
-
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/
This archive was generated by hypermail 2b29 : Mon Sep 23 2002 - 22:00:29 EST