git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[pandora-kernel.git]
/
drivers
/
pci
/
hotplug
/
pcihp_skeleton.c
diff --git
a/drivers/pci/hotplug/pcihp_skeleton.c
b/drivers/pci/hotplug/pcihp_skeleton.c
index
2b9e10e
..
e3dd6cf
100644
(file)
--- a/
drivers/pci/hotplug/pcihp_skeleton.c
+++ b/
drivers/pci/hotplug/pcihp_skeleton.c
@@
-33,8
+33,8
@@
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#include <linux/init.h>
#include <linux/init.h>
-#include "pci_hotplug.h"
#define SLOT_NAME_SIZE 10
struct slot {
#define SLOT_NAME_SIZE 10
struct slot {
@@
-98,7
+98,7
@@
static int enable_slot(struct hotplug_slot *hotplug_slot)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
/*
* Fill in code here to enable the specified slot
/*
* Fill in code here to enable the specified slot
@@
-112,7
+112,7
@@
static int disable_slot(struct hotplug_slot *hotplug_slot)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
/*
* Fill in code here to disable the specified slot
/*
* Fill in code here to disable the specified slot
@@
-126,7
+126,7
@@
static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
switch (status) {
case 0:
switch (status) {
case 0:
@@
-151,7
+151,7
@@
static int hardware_test(struct hotplug_slot *hotplug_slot, u32 value)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
switch (value) {
case 0:
switch (value) {
case 0:
@@
-170,7
+170,7
@@
static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
/*
* Fill in logic to get the current power status of the specific
/*
* Fill in logic to get the current power status of the specific
@@
-185,7
+185,7
@@
static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
/*
* Fill in logic to get the current attention status of the specific
/*
* Fill in logic to get the current attention status of the specific
@@
-200,7
+200,7
@@
static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
/*
* Fill in logic to get the current latch status of the specific
/*
* Fill in logic to get the current latch status of the specific
@@
-215,7
+215,7
@@
static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
struct slot *slot = hotplug_slot->private;
int retval = 0;
struct slot *slot = hotplug_slot->private;
int retval = 0;
- dbg("%s - physical_slot = %s\n", __
FUNCTION
__, hotplug_slot->name);
+ dbg("%s - physical_slot = %s\n", __
func
__, hotplug_slot->name);
/*
* Fill in logic to get the current adapter status of the specific
/*
* Fill in logic to get the current adapter status of the specific
@@
-229,7
+229,7
@@
static void release_slot(struct hotplug_slot *hotplug_slot)
{
struct slot *slot = hotplug_slot->private;
{
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->info);
kfree(slot->hotplug_slot);
kfree(slot);
kfree(slot->hotplug_slot->info);
kfree(slot->hotplug_slot);
kfree(slot);