Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64388
b: refs/heads/master
c: 4721a4c
h: refs/heads/master
v: v3
  • Loading branch information
Bjorn Helgaas authored and Len Brown committed Aug 24, 2007
1 parent 3d92e35 commit 21e88b4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 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: 4cec086b219224167c22dd020d3dd2d9220e1d98
refs/heads/master: 4721a4cc8864f0eb92958c3e0479e7994e8b0072
13 changes: 5 additions & 8 deletions trunk/drivers/pnp/pnpacpi/rsparser.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_resource_table *res
static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
void *data)
{
struct pnp_resource_table *res_table =
(struct pnp_resource_table *)data;
struct pnp_resource_table *res_table = data;
int i;

switch (res->type) {
Expand Down Expand Up @@ -564,8 +563,7 @@ static acpi_status pnpacpi_option_resource(struct acpi_resource *res,
void *data)
{
int priority = 0;
struct acpipnp_parse_option_s *parse_data =
(struct acpipnp_parse_option_s *)data;
struct acpipnp_parse_option_s *parse_data = data;
struct pnp_dev *dev = parse_data->dev;
struct pnp_option *option = parse_data->option;

Expand Down Expand Up @@ -703,7 +701,7 @@ static int pnpacpi_supported_resource(struct acpi_resource *res)
static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
void *data)
{
int *res_cnt = (int *)data;
int *res_cnt = data;

if (pnpacpi_supported_resource(res))
(*res_cnt)++;
Expand All @@ -712,7 +710,7 @@ static acpi_status pnpacpi_count_resources(struct acpi_resource *res,

static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
{
struct acpi_resource **resource = (struct acpi_resource **)data;
struct acpi_resource **resource = data;

if (pnpacpi_supported_resource(res)) {
(*resource)->type = res->type;
Expand Down Expand Up @@ -884,8 +882,7 @@ int pnpacpi_encode_resources(struct pnp_resource_table *res_table,
int i = 0;
/* pnpacpi_build_resource_template allocates extra mem */
int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
struct acpi_resource *resource =
(struct acpi_resource *)buffer->pointer;
struct acpi_resource *resource = buffer->pointer;
int port = 0, irq = 0, dma = 0, mem = 0;

pnp_dbg("res cnt %d", res_cnt);
Expand Down

0 comments on commit 21e88b4

Please sign in to comment.