Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d7f2cdd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

PNP / ACPI: join strings back for better maintenance 



Simply join string literals back for better maintenance and debugging.

No functional changes intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2a56e919

drivers/pnp/pnpacpi/rsparser.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -149,8 +149,8 @@ static int vendor_resource_matches(struct pnp_dev *dev, 
	    uuid_len == sizeof(match->data) &&

	    uuid_len == sizeof(match->data) &&

	    memcmp(uuid, match->data, uuid_len) == 0) {

	    memcmp(uuid, match->data, uuid_len) == 0) {

		if (expected_len && expected_len != actual_len) {

		if (expected_len && expected_len != actual_len) {

			dev_err(&dev->dev, "wrong vendor descriptor size; "

			dev_err(&dev->dev,

				"expected %d, found %d bytes\n",

				"wrong vendor descriptor size; expected %d, found %d bytes\n",

				expected_len, actual_len);

				expected_len, actual_len);

			return 0;

			return 0;

		}

		}
@@ -204,9 +204,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
			 * one interrupt, we won't be able to re-encode it.

			 * one interrupt, we won't be able to re-encode it.

			 */

			 */

			if (pnp_can_write(dev)) {

			if (pnp_can_write(dev)) {

				dev_warn(&dev->dev, "multiple interrupts in "

				dev_warn(&dev->dev,

					 "_CRS descriptor; configuration can't "

					 "multiple interrupts in _CRS descriptor; configuration can't be changed\n");

					 "be changed\n");

				dev->capabilities &= ~PNP_WRITE;

				dev->capabilities &= ~PNP_WRITE;

			}

			}

		}

		}
@@ -347,8 +346,8 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev, 
			if (p->interrupts[i] < PNP_IRQ_NR)

			if (p->interrupts[i] < PNP_IRQ_NR)

				__set_bit(p->interrupts[i], map.bits);

				__set_bit(p->interrupts[i], map.bits);

			else

			else

				dev_err(&dev->dev, "ignoring IRQ %d option "

				dev_err(&dev->dev,

					"(too large for %d entry bitmap)\n",

					"ignoring IRQ %d option (too large for %d entry bitmap)\n",

					p->interrupts[i], PNP_IRQ_NR);

					p->interrupts[i], PNP_IRQ_NR);

		}

		}

	}

	}
@@ -949,8 +948,9 @@ int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer) 
		case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:

		case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:

		case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:

		case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:

		default:	/* other type */

		default:	/* other type */

			dev_warn(&dev->dev, "can't encode unknown resource "

			dev_warn(&dev->dev,

				 "type %d\n", resource->type);

				 "can't encode unknown resource type %d\n",

				 resource->type);

			return -EINVAL;

			return -EINVAL;

		}

		}

		resource++;

		resource++;