appletalk: Remove deadcode

alloc_ltalkdev in net/appletalk/dev.c is dead since
commit 00f3696f7555 ("net: appletalk: remove cops support")

Removing it (and it's helper) leaves dev.c and if_ltalk.h empty;
remove them and the Makefile entry.

tun.c was including that if_ltalk.h but actually wanted
the uapi version for LTALK_ALEN, fix up the path.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9a0f6eb3201661d96b187a695c23b7d211c9e80e..d7a865ef370b6968c095510ae16b5196e30e54b9 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -71,7 +71,7 @@
 #include <linux/bpf_trace.h>
 #include <linux/mutex.h>
 #include <linux/ieee802154.h>
-#include <linux/if_ltalk.h>
+#include <uapi/linux/if_ltalk.h>
 #include <uapi/linux/if_fddi.h>
 #include <uapi/linux/if_hippi.h>
 #include <uapi/linux/if_fc.h>

diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h
deleted file mode 100644 (file)
index 4cc1c0b..0000000
--- a/include/linux/if_ltalk.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __LINUX_LTALK_H
-#define __LINUX_LTALK_H
-
-#include <uapi/linux/if_ltalk.h>
-
-extern struct net_device *alloc_ltalkdev(int sizeof_priv);
-#endif

diff --git a/net/appletalk/Makefile b/net/appletalk/Makefile
index 33164d972d3797c772f6feb4ec7dd96303b7ea6b..152312a151800e6de208df4e8c21725e1cbaabcf 100644 (file)
--- a/net/appletalk/Makefile
+++ b/net/appletalk/Makefile
@@ -5,6 +5,6 @@
 
 obj-$(CONFIG_ATALK) += appletalk.o
 
-appletalk-y                    := aarp.o ddp.o dev.o
+appletalk-y                    := aarp.o ddp.o
 appletalk-$(CONFIG_PROC_FS)    += atalk_proc.o
 appletalk-$(CONFIG_SYSCTL)     += sysctl_net_atalk.o

diff --git a/net/appletalk/dev.c b/net/appletalk/dev.c
deleted file mode 100644 (file)
index 284c8e5..0000000
--- a/net/appletalk/dev.c
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Moved here from drivers/net/net_init.c, which is:
- *     Written 1993,1994,1995 by Donald Becker.
- */
-
-#include <linux/errno.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/if_ltalk.h>
-
-static void ltalk_setup(struct net_device *dev)
-{
-       /* Fill in the fields of the device structure with localtalk-generic values. */
-
-       dev->type               = ARPHRD_LOCALTLK;
-       dev->hard_header_len    = LTALK_HLEN;
-       dev->mtu                = LTALK_MTU;
-       dev->addr_len           = LTALK_ALEN;
-       dev->tx_queue_len       = 10;
-
-       dev->broadcast[0]       = 0xFF;
-
-       dev->flags              = IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;
-}
-
-/**
- * alloc_ltalkdev - Allocates and sets up an localtalk device
- * @sizeof_priv: Size of additional driver-private structure to be allocated
- *     for this localtalk device
- *
- * Fill in the fields of the device structure with localtalk-generic
- * values. Basically does everything except registering the device.
- *
- * Constructs a new net device, complete with a private data area of
- * size @sizeof_priv.  A 32-byte (not bit) alignment is enforced for
- * this private data area.
- */
-
-struct net_device *alloc_ltalkdev(int sizeof_priv)
-{
-       return alloc_netdev(sizeof_priv, "lt%d", NET_NAME_UNKNOWN,
-                           ltalk_setup);
-}
-EXPORT_SYMBOL(alloc_ltalkdev);