Merge pull request torvalds#170 in PROCESSOR-SDK/processor-sdk-linux from plsdk-2838 to processor-sdk-linux-4.19.y

Muralidharan Karicheri · Muralidharan Karicheri · commit 16bfb0cefca5 · 2019-06-18T13:14:26.000-05:00
* commit 'ab13039561a188d1029b94f19192abab8e978468':
  net: ethernet: ti: ptp_bc/iep: fix compiler warning
  watchdog: keystone_wdt: fix compiler warning
diff --git a/drivers/net/ethernet/ti/iep.c b/drivers/net/ethernet/ti/iep.c
@@ -1096,6 +1096,9 @@ int iep_register(struct iep *iep)
 					PTP_BC_CLOCK_TYPE_PRUICSS2);
 
 	pr_info("iep ptp bc clkid %d\n", iep->bc_clkid);
+	/* HACK: call the unused ptp_bc API to avoid compiler warning
+	 */
+	ptp_bc_mux_ctrl_register(NULL, NULL, NULL);
 	return 0;
 }
 
diff --git a/drivers/net/ethernet/ti/ptp_bc.c b/drivers/net/ethernet/ti/ptp_bc.c
@@ -196,9 +196,11 @@ EXPORT_SYMBOL_GPL(ptp_bc_clock_unregister);
 void ptp_bc_mux_ctrl_register(void *ctx, spinlock_t *lock,
 			      ptp_bc_mux_ctrl_handle_t handler)
 {
-	bc_mux_ctrl_handler = handler;
-	bc_mux_ctrl_ctx = ctx;
-	bc_mux_lock = lock;
+	if (ctx && lock && handler) {
+		bc_mux_ctrl_handler = handler;
+		bc_mux_ctrl_ctx = ctx;
+		bc_mux_lock = lock;
+	}
 }
 EXPORT_SYMBOL_GPL(ptp_bc_mux_ctrl_register);
 
diff --git a/drivers/watchdog/keystone_wdt.c b/drivers/watchdog/keystone_wdt.c
@@ -99,7 +99,7 @@ static int keystone_wdt_ping(struct watchdog_device *wdd)
 {
 	struct keystone_wdt_device *wdt = watchdog_get_drvdata(wdd);
 
-	pr_debug("%s, %x (%x): jiffies=%lu\n", __func__, wdt, wdt->base,
+	pr_debug("%s, %p (%p): jiffies=%lu\n", __func__, wdt, wdt->base,
 		 jiffies);
 
 	/* put watchdog in service state */

Original file line number	Diff line number	Diff line change
`@@ -1096,6 +1096,9 @@ int iep_register(struct iep *iep)`
`1096`	`1096`	`PTP_BC_CLOCK_TYPE_PRUICSS2);`
`1097`	`1097`
`1098`	`1098`	`pr_info("iep ptp bc clkid %d\n", iep->bc_clkid);`
	`1099`	`+ /* HACK: call the unused ptp_bc API to avoid compiler warning`
	`1100`	`+ */`
	`1101`	`+ ptp_bc_mux_ctrl_register(NULL, NULL, NULL);`
`1099`	`1102`	`return 0;`
`1100`	`1103`	`}`
`1101`	`1104`
Original file line number	Diff line number	Diff line change
`@@ -196,9 +196,11 @@ EXPORT_SYMBOL_GPL(ptp_bc_clock_unregister);`
`196`	`196`	`void ptp_bc_mux_ctrl_register(void ctx, spinlock_t lock,`
`197`	`197`	`ptp_bc_mux_ctrl_handle_t handler)`
`198`	`198`	`{`
`199`		`- bc_mux_ctrl_handler = handler;`
`200`		`- bc_mux_ctrl_ctx = ctx;`
`201`		`- bc_mux_lock = lock;`
	`199`	`+ if (ctx && lock && handler) {`
	`200`	`+ bc_mux_ctrl_handler = handler;`
	`201`	`+ bc_mux_ctrl_ctx = ctx;`
	`202`	`+ bc_mux_lock = lock;`
	`203`	`+ }`
`202`	`204`	`}`
`203`	`205`	`EXPORT_SYMBOL_GPL(ptp_bc_mux_ctrl_register);`
`204`	`206`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ static int keystone_wdt_ping(struct watchdog_device *wdd)`
`99`	`99`	`{`
`100`	`100`	`struct keystone_wdt_device *wdt = watchdog_get_drvdata(wdd);`
`101`	`101`
`102`		`- pr_debug("%s, %x (%x): jiffies=%lu\n", __func__, wdt, wdt->base,`
	`102`	`+ pr_debug("%s, %p (%p): jiffies=%lu\n", __func__, wdt, wdt->base,`
`103`	`103`	`jiffies);`
`104`	`104`
`105`	`105`	`/* put watchdog in service state */`