Skip to content

L
linux
Commit e74a5d2f authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Deepak Saxena
Browse files
Options

[PATCH] PCI Express Hotplug: remove useless NULL checks 

Remove useless NULL checks and magic numbers from PCI Express Hotplug, also
some minimal coding style fixes.
parent 784f8f37
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 92 deletions
drivers/pci/hotplug/pciehp.h
View file @ e74a5d2f
...@@ -68,9 +68,7 @@ struct pci_func { ...@@ -68,9 +68,7 @@ struct pci_func {
struct pci_dev* pci_dev; struct pci_dev* pci_dev;
}; };
#define SLOT_MAGIC 0x67267321
struct slot { struct slot {
u32 magic;
struct slot *next; struct slot *next;
u8 bus; u8 bus;
u8 device; u8 device;
...@@ -235,47 +233,10 @@ extern struct pci_func *pciehp_slot_list[256]; ...@@ -235,47 +233,10 @@ extern struct pci_func *pciehp_slot_list[256];
/* Inline functions */ /* Inline functions */
static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
/* 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", function);
return -1;
}
if (slot->magic != SLOT_MAGIC) {
dbg("%s - bad magic number for slot", function);
return -1;
}
if (!slot->hotplug_slot) {
dbg("%s - slot->hotplug_slot == NULL!", 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;
}
static inline struct slot *pciehp_find_slot (struct controller *ctrl, u8 device)
{ {
struct slot *p_slot, *tmp_slot = NULL; struct slot *p_slot, *tmp_slot = NULL;
if (!ctrl)
return NULL;
p_slot = ctrl->slot; p_slot = ctrl->slot;
dbg("p_slot = %p\n", p_slot); dbg("p_slot = %p\n", p_slot);
...@@ -293,7 +254,7 @@ static inline struct slot *pciehp_find_slot (struct controller *ctrl, u8 device) ...@@ -293,7 +254,7 @@ static inline struct slot *pciehp_find_slot (struct controller *ctrl, u8 device)
return (p_slot); return (p_slot);
} }
static inline int wait_for_ctrl_irq (struct controller *ctrl) static inline int wait_for_ctrl_irq(struct controller *ctrl)
{ {
int retval = 0; int retval = 0;
......
drivers/pci/hotplug/pciehp_core.c
View file @ e74a5d2f
...@@ -229,13 +229,10 @@ static int get_ctlr_slot_config(struct controller *ctrl) ...@@ -229,13 +229,10 @@ static int get_ctlr_slot_config(struct controller *ctrl)
/* /*
* set_attention_status - Turns the Amber LED for a slot on, off or blink * set_attention_status - Turns the Amber LED for a slot on, off or blink
*/ */
static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
{ {
struct slot *slot = get_slot (hotplug_slot, __FUNCTION__); struct slot *slot = hotplug_slot->private;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
hotplug_slot->info->attention_status = status; hotplug_slot->info->attention_status = status;
...@@ -245,12 +242,9 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) ...@@ -245,12 +242,9 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
} }
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__); struct slot *slot = hotplug_slot->private;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
...@@ -258,33 +252,25 @@ static int enable_slot (struct hotplug_slot *hotplug_slot) ...@@ -258,33 +252,25 @@ static int enable_slot (struct hotplug_slot *hotplug_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__); struct slot *slot = hotplug_slot->private;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
return pciehp_disable_slot(slot); return pciehp_disable_slot(slot);
} }
static int hardware_test (struct hotplug_slot *hotplug_slot, u32 value) static int hardware_test (struct hotplug_slot *hotplug_slot, u32 value)
{ {
return 0; return 0;
} }
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__); struct slot *slot = hotplug_slot->private;
int retval; int retval;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
retval = slot->hpc_ops->get_power_status(slot, value); retval = slot->hpc_ops->get_power_status(slot, value);
...@@ -294,14 +280,11 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -294,14 +280,11 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
return 0; return 0;
} }
static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value) static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = get_slot (hotplug_slot, __FUNCTION__); struct slot *slot = hotplug_slot->private;
int retval; int retval;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
retval = slot->hpc_ops->get_attention_status(slot, value); retval = slot->hpc_ops->get_attention_status(slot, value);
...@@ -311,14 +294,11 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -311,14 +294,11 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
return 0; return 0;
} }
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__); struct slot *slot = hotplug_slot->private;
int retval; int retval;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
retval = slot->hpc_ops->get_latch_status(slot, value); retval = slot->hpc_ops->get_latch_status(slot, value);
...@@ -328,31 +308,24 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value) ...@@ -328,31 +308,24 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
return 0; return 0;
} }
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__); struct slot *slot = hotplug_slot->private;
int retval; int retval;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
retval = slot->hpc_ops->get_adapter_status(slot, value); retval = slot->hpc_ops->get_adapter_status(slot, value);
if (retval < 0) if (retval < 0)
*value = hotplug_slot->info->adapter_status; *value = hotplug_slot->info->adapter_status;
return 0; return 0;
} }
static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value) static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
{ {
struct slot *slot = get_slot (hotplug_slot, __FUNCTION__); struct slot *slot = hotplug_slot->private;
int retval; int retval;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
...@@ -363,13 +336,10 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp ...@@ -363,13 +336,10 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp
return 0; return 0;
} }
static int get_cur_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)
{ {
struct slot *slot = get_slot (hotplug_slot, __FUNCTION__); struct slot *slot = hotplug_slot->private;
int retval; int retval;
if (slot == NULL)
return -ENODEV;
dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name); dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7