#include <linux/init.h>
#include <linux/module.h>
+#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/pci.h>
static LIST_HEAD(slot_list);
-#if !defined(CONFIG_HOTPLUG_PCI_ACPI_MODULE)
- #define MY_NAME "acpiphp"
-#else
- #define MY_NAME THIS_MODULE->name
-#endif
+#define MY_NAME "acpiphp"
static int debug;
int acpiphp_debug;
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
-MODULE_PARM(debug, "i");
MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
+module_param(debug, bool, 644);
static int enable_slot (struct hotplug_slot *slot);
static int disable_slot (struct hotplug_slot *slot);
static int set_attention_status (struct hotplug_slot *slot, u8 value);
-static int hardware_test (struct hotplug_slot *slot, u32 value);
static int get_power_status (struct hotplug_slot *slot, u8 *value);
-static int get_attention_status (struct hotplug_slot *slot, u8 *value);
static int get_address (struct hotplug_slot *slot, u32 *value);
static int get_latch_status (struct hotplug_slot *slot, u8 *value);
static int get_adapter_status (struct hotplug_slot *slot, u8 *value);
-static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value);
-static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value);
static struct hotplug_slot_ops acpi_hotplug_slot_ops = {
.owner = THIS_MODULE,
.enable_slot = enable_slot,
.disable_slot = disable_slot,
.set_attention_status = set_attention_status,
- .hardware_test = hardware_test,
.get_power_status = get_power_status,
- .get_attention_status = get_attention_status,
.get_latch_status = get_latch_status,
.get_adapter_status = get_adapter_status,
.get_address = get_address,
- .get_max_bus_speed = get_max_bus_speed,
- .get_cur_bus_speed = get_cur_bus_speed,
};
-
-/* Inline functions to check the sanity of a pointer that is passed to us */
-static inline int slot_paranoia_check (struct slot *slot, const char *function)
-{
- if (!slot) {
- dbg("%s - slot == NULL\n", function);
- return -1;
- }
- if (slot->magic != SLOT_MAGIC) {
- dbg("%s - bad magic number for slot\n", function);
- return -1;
- }
- if (!slot->hotplug_slot) {
- dbg("%s - slot->hotplug_slot == NULL!\n", function);
- return -1;
- }
- return 0;
-}
-
-
-static inline struct slot *get_slot (struct hotplug_slot *hotplug_slot, const char *function)
-{
- struct slot *slot;
-
- if (!hotplug_slot) {
- dbg("%s - hotplug_slot == NULL\n", function);
- return NULL;
- }
-
- slot = (struct slot *)hotplug_slot->private;
- if (slot_paranoia_check(slot, function))
- return NULL;
- return slot;
-}
-
-
/**
* enable_slot - power on and enable a slot
* @hotplug_slot: slot to enable
* Actual tasks are done in acpiphp_enable_slot()
*
*/
-static int enable_slot (struct hotplug_slot *hotplug_slot)
+static int enable_slot(struct hotplug_slot *hotplug_slot)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
/* enable the specified slot */
- retval = acpiphp_enable_slot(slot->acpi_slot);
-
- return retval;
+ return acpiphp_enable_slot(slot->acpi_slot);
}
* Actual tasks are done in acpiphp_disable_slot()
*
*/
-static int disable_slot (struct hotplug_slot *hotplug_slot)
+static int disable_slot(struct hotplug_slot *hotplug_slot)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
/* disable the specified slot */
- retval = acpiphp_disable_slot(slot->acpi_slot);
-
- return retval;
+ return acpiphp_disable_slot(slot->acpi_slot);
}
* attention status LED.
*
*/
-static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
+static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
{
- int retval = 0;
-
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
switch (status) {
break;
}
- return retval;
-}
-
-
-/**
- * hardware_test - hardware test
- *
- * We have nothing to do for now...
- *
- */
-static int hardware_test (struct hotplug_slot *hotplug_slot, u32 value)
-{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
-
- dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-
- err("No hardware tests are defined for this driver\n");
- retval = -ENODEV;
-
- return retval;
+ return 0;
}
-
/**
* get_power_status - get power status of a slot
* @hotplug_slot: slot to get status
* In that case, the value returned may not be reliable.
*
*/
-static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
+static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
*value = acpiphp_get_power_status(slot->acpi_slot);
- return retval;
-}
-
-
-/**
- * get_attention_status - get attention LED status
- *
- * TBD:
- * ACPI doesn't provide any formal means to access attention LED status.
- *
- */
-static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
-{
- int retval = 0;
-
- dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-
- *value = hotplug_slot->info->attention_status;
-
- return retval;
+ return 0;
}
-
/**
* get_latch_status - get latch status of a slot
* @hotplug_slot: slot to get status
* Instead, we fake latch status from _STA
*
*/
-static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
+static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
*value = acpiphp_get_latch_status(slot->acpi_slot);
- return retval;
+ return 0;
}
* Instead, we fake adapter status from _STA
*
*/
-static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
+static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
*value = acpiphp_get_adapter_status(slot->acpi_slot);
- return retval;
+ return 0;
}
* @busdev: pointer to struct pci_busdev (seg, bus, dev)
*
*/
-static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
+static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
- int retval = 0;
-
- if (slot == NULL)
- return -ENODEV;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
*value = acpiphp_get_address(slot->acpi_slot);
- return retval;
-}
-
-
-/* return dummy value because ACPI doesn't provide any method... */
-static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
-{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
-
- *value = PCI_SPEED_UNKNOWN;
-
- return 0;
-}
-
-
-/* return dummy value because ACPI doesn't provide any method... */
-static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
-{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return -ENODEV;
-
- *value = PCI_SPEED_UNKNOWN;
-
return 0;
}
-
-static int __init init_acpi (void)
+static int __init init_acpi(void)
{
int retval;
* @slot: slot to name
*
*/
-static void make_slot_name (struct slot *slot)
+static void make_slot_name(struct slot *slot)
{
snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%u",
slot->acpi_slot->sun);
*/
static void release_slot(struct hotplug_slot *hotplug_slot)
{
- struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
-
- if (slot == NULL)
- return;
+ struct slot *slot = hotplug_slot->private;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
* init_slots - initialize 'struct slot' structures for each slot
*
*/
-static int __init init_slots (void)
+static int __init init_slots(void)
{
struct slot *slot;
- int retval = 0;
+ int retval = -ENOMEM;
int i;
for (i = 0; i < num_slots; ++i) {
slot = kmalloc(sizeof(struct slot), GFP_KERNEL);
if (!slot)
- return -ENOMEM;
+ goto error;
memset(slot, 0, sizeof(struct slot));
slot->hotplug_slot = kmalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
- if (!slot->hotplug_slot) {
- kfree(slot);
- return -ENOMEM;
- }
+ if (!slot->hotplug_slot)
+ goto error_slot;
memset(slot->hotplug_slot, 0, sizeof(struct hotplug_slot));
slot->hotplug_slot->info = kmalloc(sizeof(struct hotplug_slot_info), GFP_KERNEL);
- if (!slot->hotplug_slot->info) {
- kfree(slot->hotplug_slot);
- kfree(slot);
- return -ENOMEM;
- }
+ if (!slot->hotplug_slot->info)
+ goto error_hpslot;
memset(slot->hotplug_slot->info, 0, sizeof(struct hotplug_slot_info));
slot->hotplug_slot->name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
- if (!slot->hotplug_slot->name) {
- kfree(slot->hotplug_slot->info);
- kfree(slot->hotplug_slot);
- kfree(slot);
- return -ENOMEM;
- }
+ if (!slot->hotplug_slot->name)
+ goto error_info;
- slot->magic = SLOT_MAGIC;
slot->number = i;
slot->hotplug_slot->private = slot;
slot->hotplug_slot->info->attention_status = acpiphp_get_attention_status(slot->acpi_slot);
slot->hotplug_slot->info->latch_status = acpiphp_get_latch_status(slot->acpi_slot);
slot->hotplug_slot->info->adapter_status = acpiphp_get_adapter_status(slot->acpi_slot);
+ slot->hotplug_slot->info->max_bus_speed = PCI_SPEED_UNKNOWN;
+ slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;
make_slot_name(slot);
retval = pci_hp_register(slot->hotplug_slot);
if (retval) {
err("pci_hp_register failed with error %d\n", retval);
- release_slot(slot->hotplug_slot);
- return retval;
+ goto error_name;
}
/* add slot to our internal list */
info("Slot [%s] registered\n", slot->hotplug_slot->name);
}
+ return 0;
+error_name:
+ kfree(slot->hotplug_slot->name);
+error_info:
+ kfree(slot->hotplug_slot->info);
+error_hpslot:
+ kfree(slot->hotplug_slot);
+error_slot:
+ kfree(slot);
+error:
return retval;
}
list_del(&slot->slot_list);
pci_hp_deregister(slot->hotplug_slot);
}
-
- return;
}
if (retval)
return retval;
- retval = init_slots();
- if (retval)
- return retval;
-
- return 0;
+ return init_slots();
}