aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/pnpacpi/rsparser.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pnp/pnpacpi/rsparser.c')
-rw-r--r--drivers/pnp/pnpacpi/rsparser.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 0461d4b82c46..adf17856bacc 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -450,7 +450,7 @@ int pnpacpi_parse_allocated_resource(struct pnp_dev *dev)
450 acpi_handle handle = dev->data; 450 acpi_handle handle = dev->data;
451 acpi_status status; 451 acpi_status status;
452 452
453 dev_dbg(&dev->dev, "parse allocated resources\n"); 453 pnp_dbg(&dev->dev, "parse allocated resources\n");
454 454
455 pnp_init_resources(dev); 455 pnp_init_resources(dev);
456 456
@@ -736,7 +736,7 @@ int __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev)
736 acpi_status status; 736 acpi_status status;
737 struct acpipnp_parse_option_s parse_data; 737 struct acpipnp_parse_option_s parse_data;
738 738
739 dev_dbg(&dev->dev, "parse resource options\n"); 739 pnp_dbg(&dev->dev, "parse resource options\n");
740 740
741 parse_data.dev = dev; 741 parse_data.dev = dev;
742 parse_data.option_flags = 0; 742 parse_data.option_flags = 0;
@@ -844,7 +844,7 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
844 844
845 if (!pnp_resource_enabled(p)) { 845 if (!pnp_resource_enabled(p)) {
846 irq->interrupt_count = 0; 846 irq->interrupt_count = 0;
847 dev_dbg(&dev->dev, " encode irq (%s)\n", 847 pnp_dbg(&dev->dev, " encode irq (%s)\n",
848 p ? "disabled" : "missing"); 848 p ? "disabled" : "missing");
849 return; 849 return;
850 } 850 }
@@ -856,7 +856,7 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
856 irq->interrupt_count = 1; 856 irq->interrupt_count = 1;
857 irq->interrupts[0] = p->start; 857 irq->interrupts[0] = p->start;
858 858
859 dev_dbg(&dev->dev, " encode irq %d %s %s %s (%d-byte descriptor)\n", 859 pnp_dbg(&dev->dev, " encode irq %d %s %s %s (%d-byte descriptor)\n",
860 (int) p->start, 860 (int) p->start,
861 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", 861 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
862 polarity == ACPI_ACTIVE_LOW ? "low" : "high", 862 polarity == ACPI_ACTIVE_LOW ? "low" : "high",
@@ -873,7 +873,7 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
873 873
874 if (!pnp_resource_enabled(p)) { 874 if (!pnp_resource_enabled(p)) {
875 extended_irq->interrupt_count = 0; 875 extended_irq->interrupt_count = 0;
876 dev_dbg(&dev->dev, " encode extended irq (%s)\n", 876 pnp_dbg(&dev->dev, " encode extended irq (%s)\n",
877 p ? "disabled" : "missing"); 877 p ? "disabled" : "missing");
878 return; 878 return;
879 } 879 }
@@ -886,7 +886,7 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
886 extended_irq->interrupt_count = 1; 886 extended_irq->interrupt_count = 1;
887 extended_irq->interrupts[0] = p->start; 887 extended_irq->interrupts[0] = p->start;
888 888
889 dev_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start, 889 pnp_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start,
890 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", 890 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
891 polarity == ACPI_ACTIVE_LOW ? "low" : "high", 891 polarity == ACPI_ACTIVE_LOW ? "low" : "high",
892 extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive"); 892 extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive");
@@ -900,7 +900,7 @@ static void pnpacpi_encode_dma(struct pnp_dev *dev,
900 900
901 if (!pnp_resource_enabled(p)) { 901 if (!pnp_resource_enabled(p)) {
902 dma->channel_count = 0; 902 dma->channel_count = 0;
903 dev_dbg(&dev->dev, " encode dma (%s)\n", 903 pnp_dbg(&dev->dev, " encode dma (%s)\n",
904 p ? "disabled" : "missing"); 904 p ? "disabled" : "missing");
905 return; 905 return;
906 } 906 }
@@ -935,7 +935,7 @@ static void pnpacpi_encode_dma(struct pnp_dev *dev,
935 dma->channel_count = 1; 935 dma->channel_count = 1;
936 dma->channels[0] = p->start; 936 dma->channels[0] = p->start;
937 937
938 dev_dbg(&dev->dev, " encode dma %d " 938 pnp_dbg(&dev->dev, " encode dma %d "
939 "type %#x transfer %#x master %d\n", 939 "type %#x transfer %#x master %d\n",
940 (int) p->start, dma->type, dma->transfer, dma->bus_master); 940 (int) p->start, dma->type, dma->transfer, dma->bus_master);
941} 941}
@@ -959,7 +959,7 @@ static void pnpacpi_encode_io(struct pnp_dev *dev,
959 io->address_length = 0; 959 io->address_length = 0;
960 } 960 }
961 961
962 dev_dbg(&dev->dev, " encode io %#x-%#x decode %#x\n", io->minimum, 962 pnp_dbg(&dev->dev, " encode io %#x-%#x decode %#x\n", io->minimum,
963 io->minimum + io->address_length - 1, io->io_decode); 963 io->minimum + io->address_length - 1, io->io_decode);
964} 964}
965 965
@@ -977,7 +977,7 @@ static void pnpacpi_encode_fixed_io(struct pnp_dev *dev,
977 fixed_io->address_length = 0; 977 fixed_io->address_length = 0;
978 } 978 }
979 979
980 dev_dbg(&dev->dev, " encode fixed_io %#x-%#x\n", fixed_io->address, 980 pnp_dbg(&dev->dev, " encode fixed_io %#x-%#x\n", fixed_io->address,
981 fixed_io->address + fixed_io->address_length - 1); 981 fixed_io->address + fixed_io->address_length - 1);
982} 982}
983 983
@@ -1000,7 +1000,7 @@ static void pnpacpi_encode_mem24(struct pnp_dev *dev,
1000 memory24->address_length = 0; 1000 memory24->address_length = 0;
1001 } 1001 }
1002 1002
1003 dev_dbg(&dev->dev, " encode mem24 %#x-%#x write_protect %#x\n", 1003 pnp_dbg(&dev->dev, " encode mem24 %#x-%#x write_protect %#x\n",
1004 memory24->minimum, 1004 memory24->minimum,
1005 memory24->minimum + memory24->address_length - 1, 1005 memory24->minimum + memory24->address_length - 1,
1006 memory24->write_protect); 1006 memory24->write_protect);
@@ -1024,7 +1024,7 @@ static void pnpacpi_encode_mem32(struct pnp_dev *dev,
1024 memory32->alignment = 0; 1024 memory32->alignment = 0;
1025 } 1025 }
1026 1026
1027 dev_dbg(&dev->dev, " encode mem32 %#x-%#x write_protect %#x\n", 1027 pnp_dbg(&dev->dev, " encode mem32 %#x-%#x write_protect %#x\n",
1028 memory32->minimum, 1028 memory32->minimum,
1029 memory32->minimum + memory32->address_length - 1, 1029 memory32->minimum + memory32->address_length - 1,
1030 memory32->write_protect); 1030 memory32->write_protect);
@@ -1047,7 +1047,7 @@ static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev,
1047 fixed_memory32->address_length = 0; 1047 fixed_memory32->address_length = 0;
1048 } 1048 }
1049 1049
1050 dev_dbg(&dev->dev, " encode fixed_mem32 %#x-%#x write_protect %#x\n", 1050 pnp_dbg(&dev->dev, " encode fixed_mem32 %#x-%#x write_protect %#x\n",
1051 fixed_memory32->address, 1051 fixed_memory32->address,
1052 fixed_memory32->address + fixed_memory32->address_length - 1, 1052 fixed_memory32->address + fixed_memory32->address_length - 1,
1053 fixed_memory32->write_protect); 1053 fixed_memory32->write_protect);
@@ -1061,7 +1061,7 @@ int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer)
1061 struct acpi_resource *resource = buffer->pointer; 1061 struct acpi_resource *resource = buffer->pointer;
1062 int port = 0, irq = 0, dma = 0, mem = 0; 1062 int port = 0, irq = 0, dma = 0, mem = 0;
1063 1063
1064 dev_dbg(&dev->dev, "encode %d resources\n", res_cnt); 1064 pnp_dbg(&dev->dev, "encode %d resources\n", res_cnt);
1065 while (i < res_cnt) { 1065 while (i < res_cnt) {
1066 switch (resource->type) { 1066 switch (resource->type) {
1067 case ACPI_RESOURCE_TYPE_IRQ: 1067 case ACPI_RESOURCE_TYPE_IRQ: