| Message ID | 20230118080419.20880-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,1/1] usb: acpi: Switch to use acpi_evaluate_dsm_typed() | expand |
On Wed, Jan 18, 2023 at 10:04:19AM +0200, Andy Shevchenko wrote: > The acpi_evaluate_dsm_typed() provides a way to check the type of the > object evaluated by _DSM call. Use it instead of open coded variant. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/usb/core/usb-acpi.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c > index 533baa85083c..a34b22537d7c 100644 > --- a/drivers/usb/core/usb-acpi.c > +++ b/drivers/usb/core/usb-acpi.c > @@ -81,15 +81,11 @@ int usb_acpi_port_lpm_incapable(struct usb_device *hdev, int index) > return -ENODEV; > } > > - obj = acpi_evaluate_dsm(port_handle, &guid, 0, > - USB_DSM_DISABLE_U1_U2_FOR_PORT, NULL); > - > - if (!obj) > - return -ENODEV; > - > - if (obj->type != ACPI_TYPE_INTEGER) { > + obj = acpi_evaluate_dsm_typed(port_handle, &guid, 0, > + USB_DSM_DISABLE_U1_U2_FOR_PORT, NULL, > + ACPI_TYPE_INTEGER); > + if (!obj) { > dev_dbg(&hdev->dev, "evaluate port-%d _DSM failed\n", port1); > - ACPI_FREE(obj); > return -EINVAL; > } > > -- > 2.39.0 > Fails to apply to my tree :(
On Thu, Jan 19, 2023 at 02:11:15PM +0100, Greg Kroah-Hartman wrote: > On Wed, Jan 18, 2023 at 10:04:19AM +0200, Andy Shevchenko wrote: > > The acpi_evaluate_dsm_typed() provides a way to check the type of the > > object evaluated by _DSM call. Use it instead of open coded variant. ... > Fails to apply to my tree :( It seems it's against usb-linus as Mathias' original patch is there.
On Thu, Jan 19, 2023 at 04:37:12PM +0200, Andy Shevchenko wrote: > On Thu, Jan 19, 2023 at 02:11:15PM +0100, Greg Kroah-Hartman wrote: > > On Wed, Jan 18, 2023 at 10:04:19AM +0200, Andy Shevchenko wrote: > > > The acpi_evaluate_dsm_typed() provides a way to check the type of the > > > object evaluated by _DSM call. Use it instead of open coded variant. > > ... > > > Fails to apply to my tree :( > > It seems it's against usb-linus as Mathias' original patch is there. Ah, then that can wait until it merges into my usb-next branch. Can you resend it in a week or so when that happens? thanks, greg k-h
On Thu, Jan 19, 2023 at 04:14:23PM +0100, Greg Kroah-Hartman wrote: > On Thu, Jan 19, 2023 at 04:37:12PM +0200, Andy Shevchenko wrote: > > On Thu, Jan 19, 2023 at 02:11:15PM +0100, Greg Kroah-Hartman wrote: > > > On Wed, Jan 18, 2023 at 10:04:19AM +0200, Andy Shevchenko wrote: ... > > > Fails to apply to my tree :( > > > > It seems it's against usb-linus as Mathias' original patch is there. > > Ah, then that can wait until it merges into my usb-next branch. Can you > resend it in a week or so when that happens? Sure, thanks!
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 533baa85083c..a34b22537d7c 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -81,15 +81,11 @@ int usb_acpi_port_lpm_incapable(struct usb_device *hdev, int index) return -ENODEV; } - obj = acpi_evaluate_dsm(port_handle, &guid, 0, - USB_DSM_DISABLE_U1_U2_FOR_PORT, NULL); - - if (!obj) - return -ENODEV; - - if (obj->type != ACPI_TYPE_INTEGER) { + obj = acpi_evaluate_dsm_typed(port_handle, &guid, 0, + USB_DSM_DISABLE_U1_U2_FOR_PORT, NULL, + ACPI_TYPE_INTEGER); + if (!obj) { dev_dbg(&hdev->dev, "evaluate port-%d _DSM failed\n", port1); - ACPI_FREE(obj); return -EINVAL; }
The acpi_evaluate_dsm_typed() provides a way to check the type of the object evaluated by _DSM call. Use it instead of open coded variant. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/usb/core/usb-acpi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)