Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141887
b: refs/heads/master
c: c9d6244
h: refs/heads/master
i:
  141885: 040b0dc
  141883: 28b53bc
  141879: 3f3b1e7
  141871: 3f64fb0
  141855: c35686f
  141823: 42eb964
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Mar 17, 2009
1 parent e071d01 commit aacb4f8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1c9ca3a7d41b5db884033900b539b9aeb61a399e
refs/heads/master: c9d6244329c8149312dba27e78dc4a83b35a6ae5
38 changes: 19 additions & 19 deletions trunk/drivers/acpi/pci_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource,
void *context)
{
struct acpi_pci_link *link = context;
u32 i = 0;
u32 i;

switch (resource->type) {
case ACPI_RESOURCE_TYPE_START_DEPENDENT:
Expand Down Expand Up @@ -199,7 +199,7 @@ static int acpi_pci_link_get_possible(struct acpi_pci_link *link)
static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource,
void *context)
{
int *irq = (int *)context;
int *irq = context;

switch (resource->type) {
case ACPI_RESOURCE_TYPE_START_DEPENDENT:
Expand Down Expand Up @@ -256,7 +256,7 @@ static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource,
static int acpi_pci_link_get_current(struct acpi_pci_link *link)
{
int result = 0;
acpi_status status = AE_OK;
acpi_status status;
int irq = 0;

if (!link)
Expand Down Expand Up @@ -306,8 +306,8 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)

static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
{
int result = 0;
acpi_status status = AE_OK;
int result;
acpi_status status;
struct {
struct acpi_resource res;
struct acpi_resource end;
Expand Down Expand Up @@ -485,9 +485,9 @@ static int acpi_irq_penalty[ACPI_MAX_IRQS] = {

int __init acpi_irq_penalty_init(void)
{
struct list_head *node = NULL;
struct acpi_pci_link *link = NULL;
int i = 0;
struct list_head *node;
struct acpi_pci_link *link;
int i;

/*
* Update penalties to facilitate IRQ balancing.
Expand Down Expand Up @@ -602,9 +602,9 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
int *polarity, char **name)
{
int result = 0;
struct acpi_device *device = NULL;
struct acpi_pci_link *link = NULL;
int result;
struct acpi_device *device;
struct acpi_pci_link *link;

result = acpi_bus_get_device(handle, &device);
if (result) {
Expand Down Expand Up @@ -656,8 +656,8 @@ int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
*/
int acpi_pci_link_free_irq(acpi_handle handle)
{
struct acpi_device *device = NULL;
struct acpi_pci_link *link = NULL;
struct acpi_device *device;
struct acpi_pci_link *link;
acpi_status result;

result = acpi_bus_get_device(handle, &device);
Expand Down Expand Up @@ -707,9 +707,9 @@ int acpi_pci_link_free_irq(acpi_handle handle)

static int acpi_pci_link_add(struct acpi_device *device)
{
int result = 0;
struct acpi_pci_link *link = NULL;
int i = 0;
int result;
struct acpi_pci_link *link;
int i;
int found = 0;

if (!device)
Expand Down Expand Up @@ -777,8 +777,8 @@ static int acpi_pci_link_resume(struct acpi_pci_link *link)

static int irqrouter_resume(struct sys_device *dev)
{
struct list_head *node = NULL;
struct acpi_pci_link *link = NULL;
struct list_head *node;
struct acpi_pci_link *link;

list_for_each(node, &acpi_link.entries) {
link = list_entry(node, struct acpi_pci_link, node);
Expand All @@ -793,7 +793,7 @@ static int irqrouter_resume(struct sys_device *dev)

static int acpi_pci_link_remove(struct acpi_device *device, int type)
{
struct acpi_pci_link *link = NULL;
struct acpi_pci_link *link;

if (!device || !acpi_driver_data(device))
return -EINVAL;
Expand Down

0 comments on commit aacb4f8

Please sign in to comment.