brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: Simplify acpi_device_infer_name() 

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>
This commit is contained in:
Simon Glass 2020-12-16 21:20:23 -07:00
parent df3dc20952
commit d1e85308fe
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/acpi/acpi_device.c
View File

@ -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() */ /* 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) 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) { if (!name) {
int num;
switch (id) { switch (id) {
/* DSDT: acpi/lpss.asl */ /* DSDT: acpi/lpss.asl */
case UCLASS_SERIAL: case UCLASS_SERIAL:
num = acpi_check_seq(dev); sprintf(out_name, "URT%d", dev_seq(dev));
if (num < 0)
return num;
sprintf(out_name, "URT%d", num);
name = out_name; name = out_name;
break; break;
case UCLASS_I2C: case UCLASS_I2C:
num = acpi_check_seq(dev); sprintf(out_name, "I2C%d", dev_seq(dev));
if (num < 0)
return num;
sprintf(out_name, "I2C%d", num);
name = out_name; name = out_name;
break; break;
case UCLASS_SPI: case UCLASS_SPI:
num = acpi_check_seq(dev); sprintf(out_name, "SPI%d", dev_seq(dev));
if (num < 0)
return num;
sprintf(out_name, "SPI%d", num);
name = out_name; name = out_name;
break; break;
default: default:

6
test/dm/acpi.c
View File

@ -123,7 +123,7 @@ UCLASS_DRIVER(testacpi) = {
static int dm_test_acpi_get_name(struct unit_test_state *uts) static int dm_test_acpi_get_name(struct unit_test_state *uts)
{ {
char name[ACPI_NAME_MAX]; 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; struct udevice *pci, *root;
/* Test getting the name from the driver */ /* 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_assertok(acpi_get_name(spi, name));
ut_asserteq_str("SPI0", 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 */ /* ACPI doesn't know about the timer */
ut_assertok(uclass_first_device(UCLASS_TIMER, &timer)); ut_assertok(uclass_first_device(UCLASS_TIMER, &timer));
ut_asserteq(-ENOENT, acpi_get_name(timer, name)); ut_asserteq(-ENOENT, acpi_get_name(timer, name));