All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [PATCH v2 17/26] x86: Simplify acpi_device_infer_name()
Date: Thu, 10 Dec 2020 18:31:42 -0700	[thread overview]
Message-ID: <20201211013151.1927814-15-sjg@chromium.org> (raw)
In-Reply-To: <20201211013151.1927814-1-sjg@chromium.org>

There is no-longer any need to check if sequence numbers are valid, since
this is ensured by driver model. Drop the unwanted logic.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 lib/acpi/acpi_device.c | 27 +++------------------------
 test/dm/acpi.c         |  6 +-----
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/lib/acpi/acpi_device.c b/lib/acpi/acpi_device.c
index c3439a59883..ba0e6bf9ea8 100644
--- a/lib/acpi/acpi_device.c
+++ b/lib/acpi/acpi_device.c
@@ -784,16 +784,6 @@ static const char *acpi_name_from_id(enum uclass_id id)
 	}
 }
 
-static int acpi_check_seq(const struct udevice *dev)
-{
-	if (dev->req_seq == -1) {
-		log_warning("Device '%s' has no seq\n", dev->name);
-		return log_msg_ret("no seq", -ENXIO);
-	}
-
-	return dev->req_seq;
-}
-
 /* If you change this function, add test cases to dm_test_acpi_get_name() */
 int acpi_device_infer_name(const struct udevice *dev, char *out_name)
 {
@@ -826,29 +816,18 @@ int acpi_device_infer_name(const struct udevice *dev, char *out_name)
 		}
 	}
 	if (!name) {
-		int num;
-
 		switch (id) {
 		/* DSDT: acpi/lpss.asl */
 		case UCLASS_SERIAL:
-			num = acpi_check_seq(dev);
-			if (num < 0)
-				return num;
-			sprintf(out_name, "URT%d", num);
+			sprintf(out_name, "URT%d", dev_seq(dev));
 			name = out_name;
 			break;
 		case UCLASS_I2C:
-			num = acpi_check_seq(dev);
-			if (num < 0)
-				return num;
-			sprintf(out_name, "I2C%d", num);
+			sprintf(out_name, "I2C%d", dev_seq(dev));
 			name = out_name;
 			break;
 		case UCLASS_SPI:
-			num = acpi_check_seq(dev);
-			if (num < 0)
-				return num;
-			sprintf(out_name, "SPI%d", num);
+			sprintf(out_name, "SPI%d", dev_seq(dev));
 			name = out_name;
 			break;
 		default:
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index f5eddac10d0..021f776845e 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -123,7 +123,7 @@ UCLASS_DRIVER(testacpi) = {
 static int dm_test_acpi_get_name(struct unit_test_state *uts)
 {
 	char name[ACPI_NAME_MAX];
-	struct udevice *dev, *dev2, *i2c, *spi, *serial, *timer, *sound;
+	struct udevice *dev, *dev2, *i2c, *spi, *timer, *sound;
 	struct udevice *pci, *root;
 
 	/* Test getting the name from the driver */
@@ -146,10 +146,6 @@ static int dm_test_acpi_get_name(struct unit_test_state *uts)
 	ut_assertok(acpi_get_name(spi, name));
 	ut_asserteq_str("SPI0", name);
 
-	/* The uart has no sequence number, so this should fail */
-	ut_assertok(uclass_first_device(UCLASS_SERIAL, &serial));
-	ut_asserteq(-ENXIO, acpi_get_name(serial, name));
-
 	/* ACPI doesn't know about the timer */
 	ut_assertok(uclass_first_device(UCLASS_TIMER, &timer));
 	ut_asserteq(-ENOENT, acpi_get_name(timer, name));
-- 
2.29.2.576.ga3fc446d84-goog

  parent reply	other threads:[~2020-12-11  1:31 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-11  1:31 [PATCH v2 00/26] dm: Change the way sequence numbers are implemented Simon Glass
2020-12-11  1:31 ` [PATCH v2 01/26] linker_lists: Fix alignment issue Simon Glass
2020-12-11  1:31 ` [PATCH v2 02/26] dm: Avoid accessing seq directly Simon Glass
2020-12-11  1:31 ` [PATCH v2 03/26] dm: core: Update uclass_find_next_free_req_seq() args Simon Glass
2020-12-11  1:31 ` [PATCH v2 04/26] dm: core: Add a new sequence number for devices Simon Glass
2020-12-11  1:31 ` [PATCH v2 05/26] dm: test: Check all devices have a sequence numbers Simon Glass
2020-12-11  1:31 ` [PATCH v2 06/26] dm: core: Switch binding to use new " Simon Glass
2020-12-11  1:31 ` [PATCH v2 07/26] dm: Fix return value in dev_read_alias_seq() Simon Glass
2020-12-11  1:31 ` [PATCH v2 08/26] dm: test: Drop assumptions of no sequence numbers Simon Glass
2020-12-11  1:31 ` [PATCH v2 09/26] octeon: Don't attempt to set the sequence number Simon Glass
2020-12-11  1:31 ` [PATCH v2 10/26] i2c: Update for new sequence numbers Simon Glass
2020-12-11  1:31 ` [PATCH v2 11/26] net: Update to use " Simon Glass
2020-12-11  1:31 ` [PATCH v2 12/26] pci: " Simon Glass
2020-12-11  1:31 ` [PATCH v2 13/26] spi: Update for " Simon Glass
2020-12-11  1:31 ` [PATCH v2 14/26] usb: ehci-mx6: Drop assignment of sequence number Simon Glass
2020-12-11  1:31 ` [PATCH v2 15/26] usb: Update for new sequence numbers Simon Glass
2020-12-11  1:31 ` [PATCH v2 16/26] x86: Drop unnecessary mp_init logic Simon Glass
2020-12-11  1:31 ` Simon Glass [this message]
2020-12-11  1:31 ` [PATCH v2 18/26] gpio: Update for new sequence numbers Simon Glass
2020-12-11  1:31 ` [PATCH v2 19/26] pinctrl: " Simon Glass
2020-12-11  1:31 ` [PATCH v2 20/26] dm: Switch over to use new sequence number for dev_seq() Simon Glass
2020-12-11  1:31 ` [PATCH v2 21/26] dm: Drop uclass_resolve_seq() Simon Glass
2020-12-11  1:31 ` [PATCH v2 22/26] dm: Drop the unused arg in uclass_find_device_by_seq() Simon Glass
2020-12-11  1:31 ` [PATCH v2 23/26] dm: core: Update uclass_find_next_free_req_seq() for new scheme Simon Glass
2020-12-11  1:31 ` [PATCH v2 24/26] cmd: Drop use of old sequence numbers in commands Simon Glass
2020-12-11  1:31 ` [PATCH v2 25/26] dm: core: Drop seq and req_seq Simon Glass
2020-12-11  1:31 ` [PATCH v2 26/26] dm: Update documentation for new sequence numbers Simon Glass
2020-12-11  8:55 ` [PATCH v2 00/26] dm: Change the way sequence numbers are implemented Michael Walle
2020-12-12 15:39   ` Simon Glass
2020-12-12 17:53     ` Michael Walle
2020-12-12 18:38       ` Simon Glass
2020-12-15  4:28         ` Simon Glass
2020-12-15  8:58           ` Michael Walle
2020-12-15 16:50             ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201211013151.1927814-15-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.