From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: andrew@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org,
jacob.e.keller@intel.com, horms@kernel.org, sd@queasysnail.net,
chunkeey@gmail.com
Subject: [PATCH net-next 14/14] net: ibm: emac: mal: move dcr map down
Date: Sat, 5 Oct 2024 19:28:44 -0700 [thread overview]
Message-ID: <20241006022844.1041039-15-rosenp@gmail.com> (raw)
In-Reply-To: <20241006022844.1041039-1-rosenp@gmail.com>
There's actually a bug above where it returns instead of calling goto.
Instead of calling goto, move dcr_map and friends down as they're used
right after the spinlock in mal_reset.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/ethernet/ibm/emac/mal.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 4f58a38f4b32..e6354843d856 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -553,6 +553,18 @@ static int mal_probe(struct platform_device *ofdev)
}
mal->num_rx_chans = prop[0];
+ if (of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal-405ez")) {
+#if defined(CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT) && \
+ defined(CONFIG_IBM_EMAC_MAL_COMMON_ERR)
+ mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
+ MAL_FTR_COMMON_ERR_INT);
+#else
+ printk(KERN_ERR "%pOF: Support for 405EZ not enabled!\n",
+ ofdev->dev.of_node);
+ return -ENODEV;
+#endif
+ }
+
dcr_base = dcr_resource_start(ofdev->dev.of_node, 0);
if (dcr_base == 0) {
printk(KERN_ERR
@@ -566,18 +578,6 @@ static int mal_probe(struct platform_device *ofdev)
return -ENODEV;
}
- if (of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal-405ez")) {
-#if defined(CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT) && \
- defined(CONFIG_IBM_EMAC_MAL_COMMON_ERR)
- mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
- MAL_FTR_COMMON_ERR_INT);
-#else
- printk(KERN_ERR "%pOF: Support for 405EZ not enabled!\n",
- ofdev->dev.of_node);
- return -ENODEV;
-#endif
- }
-
INIT_LIST_HEAD(&mal->poll_list);
INIT_LIST_HEAD(&mal->list);
spin_lock_init(&mal->lock);
--
2.46.2
next prev parent reply other threads:[~2024-10-06 2:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-06 2:28 [PATCH net-next 00/14] ibm: emac: cleanup modules Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 01/14] net: ibm: emac: tah: use devm for kzalloc Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 02/14] net: ibm: emac: tah: use devm for mutex_init Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 03/14] net: ibm: emac: tah: devm_platform_get_resources Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 04/14] net: ibm: emac: rgmii: use devm for kzalloc Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 05/14] net: ibm: emac: rgmii: use devm for mutex_init Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 06/14] net: ibm: emac: rgmii: devm_platform_get_resource Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 07/14] net: ibm: emac: zmii: use devm for kzalloc Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 08/14] net: ibm: emac: zmii: use devm for mutex_init Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 09/14] net: ibm: emac: zmii: devm_platform_get_resource Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 10/14] net: ibm: emac: mal: use devm for kzalloc Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 11/14] net: ibm: emac: mal: use devm for request_irq Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 12/14] net: ibm: emac: mal: move irq maps down Rosen Penev
2024-10-06 2:28 ` [PATCH net-next 13/14] net: ibm: emac: mal: add dcr_unmap to _remove Rosen Penev
2024-10-06 2:28 ` Rosen Penev [this message]
2024-10-07 14:31 ` [PATCH net-next 00/14] ibm: emac: cleanup modules Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241006022844.1041039-15-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=andrew@lunn.ch \
--cc=chunkeey@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sd@queasysnail.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).