| Message ID | 20191018105128.4382-1-ben.dooks@codethink.co.uk |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | ptp_pch: include ethernet driver for external functions | expand |
On 18/10/2019 11:51, Ben Dooks (Codethink) wrote: > 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? > > Signed-off-by: Ben Dooks (Codethink) <ben.dooks@codethink.co.uk> > --- > Cc: Richard Cochran <richardcochran@gmail.com> > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/ptp/ptp_pch.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c > index dcd6e00c8046..2bb1184b6359 100644 > --- a/drivers/ptp/ptp_pch.c > +++ b/drivers/ptp/ptp_pch.c > @@ -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 > + > #define STATION_ADDR_LEN 20 > #define PCI_DEVICE_ID_PCH_1588 0x8819 > #define IO_MEM_BAR 1 >
On Fri, Oct 18, 2019 at 11:51:28AM +0100, Ben Dooks (Codethink) wrote: > 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. > 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
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index dcd6e00c8046..2bb1184b6359 100644 --- a/drivers/ptp/ptp_pch.c +++ b/drivers/ptp/ptp_pch.c @@ -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
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? Signed-off-by: Ben Dooks (Codethink) <ben.dooks@codethink.co.uk> --- Cc: Richard Cochran <richardcochran@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/ptp/ptp_pch.c | 2 ++ 1 file changed, 2 insertions(+)