git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
cpci_hotplug_core.c
diff --git
a/drivers/pci/hotplug/cpci_hotplug_core.c
b/drivers/pci/hotplug/cpci_hotplug_core.c
index
30af105
..
6845515
100644
(file)
--- a/
drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/
drivers/pci/hotplug/cpci_hotplug_core.c
@@
-25,17
+25,16
@@
* Send feedback to <scottm@somanetworks.com>
*/
* Send feedback to <scottm@somanetworks.com>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
#include <asm/atomic.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/smp_lock.h>
#include <asm/atomic.h>
#include <linux/delay.h>
-#include "pci_hotplug.h"
#include "cpci_hotplug.h"
#define DRIVER_AUTHOR "Scott Murray <scottm@somanetworks.com>"
#include "cpci_hotplug.h"
#define DRIVER_AUTHOR "Scott Murray <scottm@somanetworks.com>"
@@
-248,22
+247,19
@@
cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)
* with the pci_hotplug subsystem.
*/
for (i = first; i <= last; ++i) {
* with the pci_hotplug subsystem.
*/
for (i = first; i <= last; ++i) {
- slot = k
m
alloc(sizeof (struct slot), GFP_KERNEL);
+ slot = k
z
alloc(sizeof (struct slot), GFP_KERNEL);
if (!slot)
goto error;
if (!slot)
goto error;
- memset(slot, 0, sizeof (struct slot));
hotplug_slot =
hotplug_slot =
-
km
alloc(sizeof (struct hotplug_slot), GFP_KERNEL);
+
kz
alloc(sizeof (struct hotplug_slot), GFP_KERNEL);
if (!hotplug_slot)
goto error_slot;
if (!hotplug_slot)
goto error_slot;
- memset(hotplug_slot, 0, sizeof (struct hotplug_slot));
slot->hotplug_slot = hotplug_slot;
slot->hotplug_slot = hotplug_slot;
- info = k
m
alloc(sizeof (struct hotplug_slot_info), GFP_KERNEL);
+ info = k
z
alloc(sizeof (struct hotplug_slot_info), GFP_KERNEL);
if (!info)
goto error_hpslot;
if (!info)
goto error_hpslot;
- memset(info, 0, sizeof (struct hotplug_slot_info));
hotplug_slot->info = info;
name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
hotplug_slot->info = info;
name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
@@
-346,12
+342,12
@@
cpci_hp_unregister_bus(struct pci_bus *bus)
/* This is the interrupt mode interrupt handler */
static irqreturn_t
/* This is the interrupt mode interrupt handler */
static irqreturn_t
-cpci_hp_intr(int irq, void *data
, struct pt_regs *regs
)
+cpci_hp_intr(int irq, void *data)
{
dbg("entered cpci_hp_intr");
/* Check to see if it was our interrupt */
{
dbg("entered cpci_hp_intr");
/* Check to see if it was our interrupt */
- if ((controller->irq_flags &
SA_SHIRQ
) &&
+ if ((controller->irq_flags &
IRQF_SHARED
) &&
!controller->ops->check_irq(controller->dev_id)) {
dbg("exited cpci_hp_intr, not our interrupt");
return IRQ_NONE;
!controller->ops->check_irq(controller->dev_id)) {
dbg("exited cpci_hp_intr, not our interrupt");
return IRQ_NONE;