wr_nic: unify device.c wrn_drvdata and wrn_dev

(commit amended by alessandro to avoid #ifdef in the functions) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

wr_nic: unify device.c wrn_drvdata and wrn_dev
(commit amended by alessandro to avoid #ifdef in the functions) Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
d986bbf5 · Adam Wujek · Alessandro Rubini · be23d080 · d986bbf5
Commit d986bbf5 authored Oct 28, 2014 by Adam Wujek 💬 Committed by Alessandro Rubini Dec 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 3 deletions

device.c kernel/wr_nic/device.c +17 -3

No files found.
--- a/kernel/wr_nic/device.c
+++ b/kernel/wr_nic/device.c
@@ -24,10 +24,24 @@
 #include "wr-nic.h"
 #include "nic-mem.h"
+#if WR_IS_NODE /* Our platform_data is different in node vs switch */
+#include "../spec-nic.h"
+static inline struct wrn_dev *wrn_from_pdev(struct platform_device *pdev)
+{
+	struct wrn_drvdata *drvdata = pdev->dev.platform_data;
+	return drvdata->wrn;
+}
+#else /* WR_IS_SWITCH */
+static inline struct wrn_dev *wrn_from_pdev(struct platform_device *pdev)
+{
+	return pdev->dev.platform_data;
+}
+#endif
 /* The remove function is used by probe, so it's not __devexit */
 static int wrn_remove(struct platform_device *pdev)
 {
-	struct wrn_dev *wrn = pdev->dev.platform_data;
+	struct wrn_dev *wrn = wrn_from_pdev(pdev);
 	int i;
 	if (WR_IS_SWITCH) {
@@ -70,7 +84,7 @@ static int __wrn_map_resources(struct platform_device *pdev)
 	int i;
 	struct resource *res;
 	void __iomem *ptr;
-	struct wrn_dev *wrn = pdev->dev.platform_data;
+	struct wrn_dev *wrn = wrn_from_pdev(pdev);
 	/*
 	 * The memory regions are mapped once for all endpoints.
@@ -98,7 +112,7 @@ static int wrn_probe(struct platform_device *pdev)
 {
 	struct net_device *netdev;
 	struct wrn_ep *ep;
-	struct wrn_dev *wrn = pdev->dev.platform_data;
+	struct wrn_dev *wrn = wrn_from_pdev(pdev);
 	int i, err = 0;
 	/* Lazily: irqs are not in the resource list */