| Message ID | 20220907103007.12954-1-heikki.krogerus@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1538dc8c1561f0de4ba57a69e2a421a1a3951618 |
| Headers | show |
| Series | usb: typec: intel_pmc_mux: Use the helper acpi_dev_get_memory_resources() | expand |
On Wed, Sep 7, 2022 at 12:30 PM Heikki Krogerus <heikki.krogerus@linux.intel.com> wrote: > > It removes the need to check the resource data type > separately. > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > Hi Rafael, > > Now resending this [1]. It applies on top of -rc4 (not -rc3). The > other patches from that series you already picked. > > thanks, > > [1] https://lore.kernel.org/linux-acpi/20220816101629.69054-7-heikki.krogerus@linux.intel.com/ Applied, thanks! Note that I rebased the other commits from this series on top of -rc4 too, but that will become visible when the rebased ones go into my linux-next branch. Thanks! > --- > drivers/usb/typec/mux/intel_pmc_mux.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c > index a8e273fe204ab..e1f4df7238bf4 100644 > --- a/drivers/usb/typec/mux/intel_pmc_mux.c > +++ b/drivers/usb/typec/mux/intel_pmc_mux.c > @@ -569,15 +569,6 @@ static int pmc_usb_register_port(struct pmc_usb *pmc, int index, > return ret; > } > > -static int is_memory(struct acpi_resource *res, void *data) > -{ > - struct resource_win win = {}; > - struct resource *r = &win.res; > - > - return !(acpi_dev_resource_memory(res, r) || > - acpi_dev_resource_address_space(res, &win)); > -} > - > /* IOM ACPI IDs and IOM_PORT_STATUS_OFFSET */ > static const struct acpi_device_id iom_acpi_ids[] = { > /* TigerLake */ > @@ -611,7 +602,7 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc) > return -ENODEV; > > INIT_LIST_HEAD(&resource_list); > - ret = acpi_dev_get_resources(adev, &resource_list, is_memory, NULL); > + ret = acpi_dev_get_memory_resources(adev, &resource_list); > if (ret < 0) > return ret; > > -- > 2.35.1 >
diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index a8e273fe204ab..e1f4df7238bf4 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -569,15 +569,6 @@ static int pmc_usb_register_port(struct pmc_usb *pmc, int index, return ret; } -static int is_memory(struct acpi_resource *res, void *data) -{ - struct resource_win win = {}; - struct resource *r = &win.res; - - return !(acpi_dev_resource_memory(res, r) || - acpi_dev_resource_address_space(res, &win)); -} - /* IOM ACPI IDs and IOM_PORT_STATUS_OFFSET */ static const struct acpi_device_id iom_acpi_ids[] = { /* TigerLake */ @@ -611,7 +602,7 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc) return -ENODEV; INIT_LIST_HEAD(&resource_list); - ret = acpi_dev_get_resources(adev, &resource_list, is_memory, NULL); + ret = acpi_dev_get_memory_resources(adev, &resource_list); if (ret < 0) return ret;
It removes the need to check the resource data type separately. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- Hi Rafael, Now resending this [1]. It applies on top of -rc4 (not -rc3). The other patches from that series you already picked. thanks, [1] https://lore.kernel.org/linux-acpi/20220816101629.69054-7-heikki.krogerus@linux.intel.com/ --- drivers/usb/typec/mux/intel_pmc_mux.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)