Re: [PATCH net-next 7/9] net: lantiq_etop: remove struct resource
From: Simon Horman
Date: Tue Oct 01 2024 - 11:33:46 EST
On Mon, Sep 30, 2024 at 01:24:32PM -0700, Rosen Penev wrote:
> All of this can be simplified with devm_platformn_ioremap_resource. No
> need for extra code.
>
> Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
> ---
> drivers/net/ethernet/lantiq_etop.c | 23 +++--------------------
> 1 file changed, 3 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
> index bc97b189785e..0cb5d536f351 100644
> --- a/drivers/net/ethernet/lantiq_etop.c
> +++ b/drivers/net/ethernet/lantiq_etop.c
> @@ -90,7 +90,6 @@ struct ltq_etop_priv {
> struct net_device *netdev;
> struct platform_device *pdev;
> struct ltq_eth_data *pldata;
> - struct resource *res;
>
> struct mii_bus *mii_bus;
>
> @@ -620,28 +619,13 @@ ltq_etop_probe(struct platform_device *pdev)
> {
> struct net_device *dev;
> struct ltq_etop_priv *priv;
> - struct resource *res;
> int err;
> int i;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!res) {
> - dev_err(&pdev->dev, "failed to get etop resource");
> - return -ENOENT;
> - }
> -
> - res = devm_request_mem_region(&pdev->dev, res->start,
> - resource_size(res), dev_name(&pdev->dev));
> - if (!res) {
> - dev_err(&pdev->dev, "failed to request etop resource");
> - return -EBUSY;
> - }
> -
> - ltq_etop_membase = devm_ioremap(&pdev->dev, res->start,
> - resource_size(res));
> - if (!ltq_etop_membase) {
> + ltq_etop_membase = devm_platformn_ioremap_resource(pdev, 0);
Hi Rosen,
I believe this should be devm_platform_ioremap_resource()
> + if (IS_ERR(ltq_etop_membase)) {
> dev_err(&pdev->dev, "failed to remap etop engine %d", pdev->id);
> - return -ENOMEM;
> + return PTR_ERR(ltq_etop_membase);
> }
>
> dev = devm_alloc_etherdev_mqs(&pdev->dev, sizeof(struct ltq_etop_priv),
> @@ -651,7 +635,6 @@ ltq_etop_probe(struct platform_device *pdev)
> dev->netdev_ops = <q_eth_netdev_ops;
> dev->ethtool_ops = <q_etop_ethtool_ops;
> priv = netdev_priv(dev);
> - priv->res = res;
> priv->pdev = pdev;
> priv->pldata = dev_get_platdata(&pdev->dev);
> priv->netdev = dev;
--
pw-bot: changes-requested