diff options
Diffstat (limited to 'drivers/pnp/pnpacpi/rsparser.c')
-rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 379048fdf05d..7a535542fe92 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
@@ -298,7 +298,7 @@ static void pnpacpi_parse_dma_option(struct pnp_option *option, struct acpi_reso | |||
298 | 298 | ||
299 | if (p->channel_count == 0) | 299 | if (p->channel_count == 0) |
300 | return; | 300 | return; |
301 | dma = kcalloc(1, sizeof(struct pnp_dma), GFP_KERNEL); | 301 | dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL); |
302 | if (!dma) | 302 | if (!dma) |
303 | return; | 303 | return; |
304 | 304 | ||
@@ -354,7 +354,7 @@ static void pnpacpi_parse_irq_option(struct pnp_option *option, | |||
354 | 354 | ||
355 | if (p->interrupt_count == 0) | 355 | if (p->interrupt_count == 0) |
356 | return; | 356 | return; |
357 | irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL); | 357 | irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); |
358 | if (!irq) | 358 | if (!irq) |
359 | return; | 359 | return; |
360 | 360 | ||
@@ -375,7 +375,7 @@ static void pnpacpi_parse_ext_irq_option(struct pnp_option *option, | |||
375 | 375 | ||
376 | if (p->interrupt_count == 0) | 376 | if (p->interrupt_count == 0) |
377 | return; | 377 | return; |
378 | irq = kcalloc(1, sizeof(struct pnp_irq), GFP_KERNEL); | 378 | irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); |
379 | if (!irq) | 379 | if (!irq) |
380 | return; | 380 | return; |
381 | 381 | ||
@@ -396,7 +396,7 @@ pnpacpi_parse_port_option(struct pnp_option *option, | |||
396 | 396 | ||
397 | if (io->address_length == 0) | 397 | if (io->address_length == 0) |
398 | return; | 398 | return; |
399 | port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); | 399 | port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); |
400 | if (!port) | 400 | if (!port) |
401 | return; | 401 | return; |
402 | port->min = io->minimum; | 402 | port->min = io->minimum; |
@@ -417,7 +417,7 @@ pnpacpi_parse_fixed_port_option(struct pnp_option *option, | |||
417 | 417 | ||
418 | if (io->address_length == 0) | 418 | if (io->address_length == 0) |
419 | return; | 419 | return; |
420 | port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); | 420 | port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); |
421 | if (!port) | 421 | if (!port) |
422 | return; | 422 | return; |
423 | port->min = port->max = io->address; | 423 | port->min = port->max = io->address; |
@@ -436,7 +436,7 @@ pnpacpi_parse_mem24_option(struct pnp_option *option, | |||
436 | 436 | ||
437 | if (p->address_length == 0) | 437 | if (p->address_length == 0) |
438 | return; | 438 | return; |
439 | mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); | 439 | mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); |
440 | if (!mem) | 440 | if (!mem) |
441 | return; | 441 | return; |
442 | mem->min = p->minimum; | 442 | mem->min = p->minimum; |
@@ -459,7 +459,7 @@ pnpacpi_parse_mem32_option(struct pnp_option *option, | |||
459 | 459 | ||
460 | if (p->address_length == 0) | 460 | if (p->address_length == 0) |
461 | return; | 461 | return; |
462 | mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); | 462 | mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); |
463 | if (!mem) | 463 | if (!mem) |
464 | return; | 464 | return; |
465 | mem->min = p->minimum; | 465 | mem->min = p->minimum; |
@@ -482,7 +482,7 @@ pnpacpi_parse_fixed_mem32_option(struct pnp_option *option, | |||
482 | 482 | ||
483 | if (p->address_length == 0) | 483 | if (p->address_length == 0) |
484 | return; | 484 | return; |
485 | mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); | 485 | mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); |
486 | if (!mem) | 486 | if (!mem) |
487 | return; | 487 | return; |
488 | mem->min = mem->max = p->address; | 488 | mem->min = mem->max = p->address; |
@@ -514,7 +514,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r) | |||
514 | return; | 514 | return; |
515 | 515 | ||
516 | if (p->resource_type == ACPI_MEMORY_RANGE) { | 516 | if (p->resource_type == ACPI_MEMORY_RANGE) { |
517 | mem = kcalloc(1, sizeof(struct pnp_mem), GFP_KERNEL); | 517 | mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); |
518 | if (!mem) | 518 | if (!mem) |
519 | return; | 519 | return; |
520 | mem->min = mem->max = p->minimum; | 520 | mem->min = mem->max = p->minimum; |
@@ -524,7 +524,7 @@ pnpacpi_parse_address_option(struct pnp_option *option, struct acpi_resource *r) | |||
524 | ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0; | 524 | ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE : 0; |
525 | pnp_register_mem_resource(option, mem); | 525 | pnp_register_mem_resource(option, mem); |
526 | } else if (p->resource_type == ACPI_IO_RANGE) { | 526 | } else if (p->resource_type == ACPI_IO_RANGE) { |
527 | port = kcalloc(1, sizeof(struct pnp_port), GFP_KERNEL); | 527 | port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); |
528 | if (!port) | 528 | if (!port) |
529 | return; | 529 | return; |
530 | port->min = port->max = p->minimum; | 530 | port->min = port->max = p->minimum; |
@@ -721,7 +721,7 @@ int pnpacpi_build_resource_template(acpi_handle handle, | |||
721 | if (!res_cnt) | 721 | if (!res_cnt) |
722 | return -EINVAL; | 722 | return -EINVAL; |
723 | buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1; | 723 | buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1; |
724 | buffer->pointer = kcalloc(1, buffer->length - 1, GFP_KERNEL); | 724 | buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL); |
725 | if (!buffer->pointer) | 725 | if (!buffer->pointer) |
726 | return -ENOMEM; | 726 | return -ENOMEM; |
727 | pnp_dbg("Res cnt %d", res_cnt); | 727 | pnp_dbg("Res cnt %d", res_cnt); |