Skip to content

Commit d99d65a

Browse files
arndbgregkh
authored andcommitted
staging: gpib: make global 'usec_diff' functions static
Trying to build both gpib_bitbang and lpvo_usb_gpib into the kernel reveals a function that should have been static and is also duplicated: x86_64-linux-ld: drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.o: in function `usec_diff': lpvo_usb_gpib.c:(.text+0x23c0): multiple definition of `usec_diff'; drivers/staging/gpib/gpio/gpib_bitbang.o:gpib_bitbang.c:(.text+0x2470): first defined here Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20241212154245.1411411-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8c41fae commit d99d65a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/staging/gpib/gpio/gpib_bitbang.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ struct bb_priv {
315315
enum listener_function_state listener_state;
316316
};
317317

318-
inline long usec_diff(struct timespec64 *a, struct timespec64 *b);
318+
static inline long usec_diff(struct timespec64 *a, struct timespec64 *b);
319319
static void bb_buffer_print(unsigned char *buffer, size_t length, int cmd, int eoi);
320320
static void set_data_lines(u8 byte);
321321
static u8 get_data_lines(void);

drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ static int skel_do_release(gpib_board_t *);
210210
* (unix time in sec and NANOsec)
211211
*/
212212

213-
inline int usec_diff(struct timespec64 *a, struct timespec64 *b)
213+
static inline int usec_diff(struct timespec64 *a, struct timespec64 *b)
214214
{
215215
return ((a->tv_sec - b->tv_sec) * 1000000 +
216216
(a->tv_nsec - b->tv_nsec) / 1000);

0 commit comments

Comments
 (0)