lkml.org 
[lkml]   [2023]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH net-next v1 1/1] ptp: ocp: Use DEFINE_RES_*() in place
From
On 21/12/2023 14:06, Andy Shevchenko wrote:
> There is no need to have an intermediate functions as DEFINE_RES_*()
> macros are represented by compound literals. Just use them in place.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/ptp/ptp_ocp.c | 26 ++++++--------------------
> 1 file changed, 6 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
> index 4021d3d325f9..306353a69231 100644
> --- a/drivers/ptp/ptp_ocp.c
> +++ b/drivers/ptp/ptp_ocp.c
> @@ -1716,20 +1716,6 @@ ptp_ocp_get_mem(struct ptp_ocp *bp, struct ocp_resource *r)
> return __ptp_ocp_get_mem(bp, start, r->size);
> }
>
> -static void
> -ptp_ocp_set_irq_resource(struct resource *res, int irq)
> -{
> - struct resource r = DEFINE_RES_IRQ(irq);
> - *res = r;
> -}
> -
> -static void
> -ptp_ocp_set_mem_resource(struct resource *res, resource_size_t start, int size)
> -{
> - struct resource r = DEFINE_RES_MEM(start, size);
> - *res = r;
> -}
> -
> static int
> ptp_ocp_register_spi(struct ptp_ocp *bp, struct ocp_resource *r)
> {
> @@ -1741,15 +1727,15 @@ ptp_ocp_register_spi(struct ptp_ocp *bp, struct ocp_resource *r)
> int id;
>
> start = pci_resource_start(pdev, 0) + r->offset;
> - ptp_ocp_set_mem_resource(&res[0], start, r->size);
> - ptp_ocp_set_irq_resource(&res[1], pci_irq_vector(pdev, r->irq_vec));
> + res[0] = DEFINE_RES_MEM(start, r->size);
> + res[1] = DEFINE_RES_IRQ(pci_irq_vector(pdev, r->irq_vec));
>
> info = r->extra;
> id = pci_dev_id(pdev) << 1;
> id += info->pci_offset;
>
> p = platform_device_register_resndata(&pdev->dev, info->name, id,
> - res, 2, info->data,
> + res, ARRAY_SIZE(res), info->data,
> info->data_size);
> if (IS_ERR(p))
> return PTR_ERR(p);
> @@ -1768,11 +1754,11 @@ ptp_ocp_i2c_bus(struct pci_dev *pdev, struct ocp_resource *r, int id)
>
> info = r->extra;
> start = pci_resource_start(pdev, 0) + r->offset;
> - ptp_ocp_set_mem_resource(&res[0], start, r->size);
> - ptp_ocp_set_irq_resource(&res[1], pci_irq_vector(pdev, r->irq_vec));
> + res[0] = DEFINE_RES_MEM(start, r->size);
> + res[1] = DEFINE_RES_IRQ(pci_irq_vector(pdev, r->irq_vec));
>
> return platform_device_register_resndata(&pdev->dev, info->name,
> - id, res, 2,
> + id, res, ARRAY_SIZE(res),
> info->data, info->data_size);
> }
>

Thanks, Andy!

Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>

\
 
 \ /
  Last update: 2023-12-21 15:59    [W:0.173 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site