Skip to contentSkip to conversation

ptp_pch: include ethernet driver for external functions

PATCH In review Ben Dooks (Codethink) 2 participants 3 messages Oct 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ptp_pch: include ethernet driver for external functions

The driver uses a number of functions from the ethernet driver so include the header to remove the following warnings from sparse about undeclared functions:

drivers/ptp/ptp_pch.c:182:5: warning: symbol 'pch_ch_control_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:193:6: warning: symbol 'pch_ch_control_write' was not declared. Should it be static? drivers/ptp/ptp_pch.c:201:5: warning: symbol 'pch_ch_event_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:212:6: warning: symbol 'pch_ch_event_write' was not declared. Should it be static? drivers/ptp/ptp_pch.c:220:5: warning: symbol 'pch_src_uuid_lo_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:231:5: warning: symbol 'pch_src_uuid_hi_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:242:5: warning: symbol 'pch_rx_snap_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:259:5: warning: symbol 'pch_tx_snap_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:300:5: warning: symbol 'pch_set_station_address' was not declared. Should it be static?

Should we include the header file from the ethernet driver directly or if not, where should the declarations go?

---
Cc: Richard Cochran <[email protected]>
Cc: [email protected]
Cc: [email protected]

---
 drivers/ptp/ptp_pch.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/ptp/ptp_pch.c +2 -0
index dcd6e00c8046..2bb1184b6359 100644
@@ -20,6 +20,8 @@
 #include <linux/ptp_clock_kernel.h>
 #include <linux/slab.h>
 
+#include <../net/ethernet/oki-semi/pch_gbe/pch_gbe.h>
+
 #define STATION_ADDR_LEN	20
 #define PCI_DEVICE_ID_PCH_1588	0x8819
 #define IO_MEM_BAR 1
Signature · 1 line
2.23.0
author
#1 lore raw
Quoted 31 lines · Ben Dooks (Codethink)

The driver uses a number of functions from the ethernet driver so include the header to remove the following warnings from sparse about undeclared functions:

drivers/ptp/ptp_pch.c:182:5: warning: symbol 'pch_ch_control_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:193:6: warning: symbol 'pch_ch_control_write' was not declared. Should it be static? drivers/ptp/ptp_pch.c:201:5: warning: symbol 'pch_ch_event_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:212:6: warning: symbol 'pch_ch_event_write' was not declared. Should it be static? drivers/ptp/ptp_pch.c:220:5: warning: symbol 'pch_src_uuid_lo_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:231:5: warning: symbol 'pch_src_uuid_hi_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:242:5: warning: symbol 'pch_rx_snap_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:259:5: warning: symbol 'pch_tx_snap_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:300:5: warning: symbol 'pch_set_station_address' was not declared. Should it be static?

Should we include the header file from the ethernet driver directly or if not, where should the declarations go?

---
Cc: Richard Cochran <[email protected]>
Cc: [email protected]
Cc: [email protected]

---
  drivers/ptp/ptp_pch.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/ptp/ptp_pch.c +0 -0
index dcd6e00c8046..2bb1184b6359 100644

drivers/ptp/ptp_pch.c line 23

Quoted 4 lines
drivers/ptp/ptp_pch.c +1 -0
@@ -20,6 +20,8 @@
  #include <linux/ptp_clock_kernel.h>
  #include <linux/slab.h>
 
+#include <../net/ethernet/oki-semi/pch_gbe/pch_gbe.h>

oops, missed saving the version with ../../drivers/net

Quoted 5 lines
drivers/ptp/ptp_pch.c +1 -0
+
  #define STATION_ADDR_LEN	20
  #define PCI_DEVICE_ID_PCH_1588	0x8819
  #define IO_MEM_BAR 1
Signature · 4 lines
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

https://www.codethink.co.uk/privacy.html
maintainer
#2 lore raw
In reply to Ben Dooks (Codethink)
Quoted 5 lines · Ben Dooks (Codethink)

The driver uses a number of functions from the ethernet driver so include the header to remove the following warnings from sparse about undeclared functions:

drivers/ptp/ptp_pch.c:182:5: warning: symbol 'pch_ch_control_read' was not declared. Should it be static?

That one is never used and should be removed.

Quoted 10 lines

drivers/ptp/ptp_pch.c:193:6: warning: symbol 'pch_ch_control_write' was not declared. Should it be static? drivers/ptp/ptp_pch.c:201:5: warning: symbol 'pch_ch_event_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:212:6: warning: symbol 'pch_ch_event_write' was not declared. Should it be static? drivers/ptp/ptp_pch.c:220:5: warning: symbol 'pch_src_uuid_lo_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:231:5: warning: symbol 'pch_src_uuid_hi_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:242:5: warning: symbol 'pch_rx_snap_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:259:5: warning: symbol 'pch_tx_snap_read' was not declared. Should it be static? drivers/ptp/ptp_pch.c:300:5: warning: symbol 'pch_set_station_address' was not declared. Should it be static?

+#include <../net/ethernet/oki-semi/pch_gbe/pch_gbe.h>

Instead of that long relative path, just move ptp_pch.c out of drivers/ptp and into drivers/net/ethernet/oki-semi/pch_gbe.

Then move the shared declarations out of pch_gbe.h and into a new header file, included by both users with:

#include "ptp_pch.h"

Thanks,

Richard