From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7103E3D47CF for ; Tue, 9 Jun 2026 19:43:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781034216; cv=none; b=ilzlGEZZgyYneZvlambzVtPcrOE1ypG8WsP3onEkp9Xc+zDEOTm4Mg1CGDKP45nGOYbCyNj3Nr3/MFTTYB9F+VBX8rESsy4abdrz+Oil2CkFXwxnEHZ2/6qhNFCJgz2Zm/TKftNSMcIAEtr0Z2B9/Pzroef2GehcF8295OOCfzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781034216; c=relaxed/simple; bh=iQ+F1LVRsbcwtWCwsUa6r93L74x6r/2jwMTzP0acEJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IF7SiK57/VTWCZ5M9xnn2ADByAy5Nqu10W33IXU6D5pp3mYmdcIm1geUfH5B4b70n971I4toYZdkcneCes2GSwWZF/W+mAMwelKQFU99lcZ80hoO/Ql4CjcU6eis4BssA5DuJZ+Jm/eNN8GJ0+sCRU/fyDlG7+08v6xe92ix+fw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HT0YiuWj; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HT0YiuWj" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-84236f9b638so2818961b3a.2 for ; Tue, 09 Jun 2026 12:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781034215; x=1781639015; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QpizmCsHLyRVs4lMrEe6oCdCgLtR+geOZwGifdCy2wY=; b=HT0YiuWjIdFtD8Kt6CGY3+VJz9rU4FGv2MxTBPMjLEiABdxPQd5PuhUBsiUDzh08Uc MXXL92BBqpY37ZSHAcYwyBfhF78AfJ0k29YmrXFaapAQQl4qOQxO5EqH4wdib73kpVGM utoqc1t1MX34YViIPfANqSq7Trq0QJp6/zZuqE+gM1TvXSH7H8LVGeE3pfl4jB404w3z cOOFViO0PzoJarBLrqRJW0CrMMJ7tHURb4PDMrPOQNYk475Qu2gat2vP3eIaMfAxcXx/ OPeKiqK3tZ2Kf31YDbj55lj5oi9BG7Wi99uJ6IMd0mnFN8mdL6XObP4Glsa0CxVSbdWH BeHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781034215; x=1781639015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QpizmCsHLyRVs4lMrEe6oCdCgLtR+geOZwGifdCy2wY=; b=Llz8NuX/TvQWr8Xg8s3YhWX4v/j1Wq5w4pKzTj8HWlpI+bL7BAZ5TxqHra5cBKlsLE x/Rl3aJMaUD+o4wc3khUSgnfk8kD8UWy1xZNUXJyWQRz50INifrT0/leltwaA5zXiDlK U55RDeBccNgDHMolY8misDqttM/x3MNHdFE0C1EJybh2Ur7qXipMjDS5+uOrBCztQK4Q qPjSGPcL8bK6/whU5Zfqvs+qD5zZGKNtaPuEs2lEd/6V25dlS4jFKHSa5+UmSQaT/cHK cHhg2O9nlIcsf5+ybMQeSQDxxfKW5Nm74WE5CzbOO36AtYQXQlmTu0zHRfkWkpsIlvIj HnAw== X-Forwarded-Encrypted: i=1; AFNElJ9GhRy0iP7qmHJUoEYAZYj6VuKU0SaqjHSII8T2JO6TrHYjXQS65eenBDKdngDRbVRvYyTSEXgFKqzkRp0=@vger.kernel.org X-Gm-Message-State: AOJu0YxLDN2ElY/LTY+iYUzwZ0bHZxGopaZM4KJPh1EpZWHpK+6jwMsF d7d6jEhzvDnfjv35BZ0YfLrOnYL/7C2k3/HN9Ec5E5FBdMYz9MhsrbQ2 X-Gm-Gg: Acq92OFHPx6L2RcYtUViiewEEbplw42+9tQFvi+tTUc5BQz7/0N8spk5VNjlMtfOd7R 8UAYMHjrezkpxpkFJxMHsFAypjnuDvjyyjGEwh+mI4kPOcHxS1oJQHdf7Rx4HcyjuPQKcC0WOo4 YTMvLz500hLH5RpEhu2iqGGsKLEOAhkf63VKMMv3tgtF0o02Zq0deUE7436A/dBKgFQcDaE1GNl VkZ/+xE06xy2yHtmZ9tSriBml3PNVNAGSbB6aNAMt02FOs0f4WkvSLwnhpzpIcgg1JbHCLcqQiN 315s2vW6c2s9QBE7epf6chfdXdMUwrY34magq4u3ZEH0Bjzd4S5JmSTNjRTupW2F6rppcwExzDG EbzcdsKKcSBECJ6njHgdEPaLYAH6CmFe9w9zL3wO+ORqDggTid/h45ZmDWRjg7IuG3UMjPftU48 aqecMYg61oY3nPFU7jGjyp05Kq5j3mCRkshJgGjm+yWzk9u5g6jri5TyeebeDMjfj7kP4+lLHsM u0EPPqPGpdP4aLyg+IsgzycV46FWG06d16jAbhbDzHDdA== X-Received: by 2002:a05:6a00:f9a:b0:842:7296:dba with SMTP id d2e1a72fcca58-842b0e2fb1dmr23087891b3a.7.1781034214751; Tue, 09 Jun 2026 12:43:34 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-842828daf76sm22715683b3a.42.2026.06.09.12.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 12:43:34 -0700 (PDT) From: Rosen Penev To: linux-ide@vger.kernel.org Cc: Damien Le Moal , Niklas Cassel , Grant Likely , Tim Yamin , Julia Lawall , Jeff Garzik , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2 4/5] ata: pata_mpc52xx: convert to platform_get_irq() Date: Tue, 9 Jun 2026 12:43:10 -0700 Message-ID: <20260609194311.6217-5-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260609194311.6217-1-rosenp@gmail.com> References: <20260609194311.6217-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace irq_of_parse_and_map() with platform_get_irq(), which returns a negative errno on failure and integrates with the platform device model. Since platform_get_irq() does not create a separately managed mapping, the corresponding irq_dispose_mapping() calls in the probe error path and remove function are no longer needed. Remove most gotos from probe. Simpler to return directly. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/ata/pata_mpc52xx.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index d13cfaf285dc..84a4cf42ef54 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -730,18 +729,14 @@ static int mpc52xx_ata_probe(struct platform_device *op) if ((prop) && (proplen >= 4)) udma_mask = ATA_UDMA2 & ((1 << (*prop + 1)) - 1); - ata_irq = irq_of_parse_and_map(op->dev.of_node, 0); - if (!ata_irq) { - dev_err(&op->dev, "error mapping irq\n"); - return -EINVAL; - } + ata_irq = platform_get_irq(op, 0); + if (ata_irq < 0) + return ata_irq; /* Prepare our private structure */ priv = devm_kzalloc(&op->dev, sizeof(*priv), GFP_KERNEL); - if (!priv) { - rv = -ENOMEM; - goto err1; - } + if (!priv) + return -ENOMEM; priv->ipb_period = 1000000000 / (ipb_freq / 1000); priv->ata_regs = ata_regs; @@ -762,8 +757,7 @@ static int mpc52xx_ata_probe(struct platform_device *op) dmatsk = bcom_ata_init(MAX_DMA_BUFFERS, MAX_DMA_BUFFER_SIZE); if (!dmatsk) { dev_err(&op->dev, "bestcomm initialization failed\n"); - rv = -ENOMEM; - goto err1; + return -ENOMEM; } priv->dmatsk = dmatsk; @@ -797,8 +791,6 @@ static int mpc52xx_ata_probe(struct platform_device *op) free_irq(task_irq, priv); err_free_task: bcom_ata_release(dmatsk); - err1: - irq_dispose_mapping(ata_irq); return rv; } @@ -815,7 +807,6 @@ static void mpc52xx_ata_remove(struct platform_device *op) task_irq = bcom_get_task_irq(priv->dmatsk); free_irq(task_irq, priv); bcom_ata_release(priv->dmatsk); - irq_dispose_mapping(priv->ata_irq); } #ifdef CONFIG_PM_SLEEP -- 2.54.0