@@ -52,7 +52,6 @@ static unsigned int CLOCK_BASE;
5252#define PC300_CHMEDIA_MASK (port ) (0x00000020UL << ((port) * 3))
5353#define PC300_CTYPE_MASK (0x00000800UL)
5454
55-
5655enum { PC300_RSV = 1 , PC300_X21 , PC300_TE }; /* card types */
5756
5857/*
@@ -71,8 +70,6 @@ typedef struct {
7170 u32 init_ctrl ; /* 50h : EEPROM ctrl, Init Ctrl, etc */
7271}plx9050 ;
7372
74-
75-
7673typedef struct port_s {
7774 struct napi_struct napi ;
7875 struct net_device * netdev ;
@@ -90,8 +87,6 @@ typedef struct port_s {
9087 u8 chan ; /* physical port # - 0 or 1 */
9188}port_t ;
9289
93-
94-
9590typedef struct card_s {
9691 int type ; /* RSV, X21, etc. */
9792 int n_ports ; /* 1 or 2 ports */
@@ -107,13 +102,11 @@ typedef struct card_s {
107102 port_t ports [2 ];
108103}card_t ;
109104
110-
111105#define get_port (card , port ) ((port) < (card)->n_ports ? \
112106 (&(card)->ports[port]) : (NULL))
113107
114108#include "hd64572.c"
115109
116-
117110static void pc300_set_iface (port_t * port )
118111{
119112 card_t * card = port -> card ;
@@ -162,8 +155,6 @@ static void pc300_set_iface(port_t *port)
162155 }
163156}
164157
165-
166-
167158static int pc300_open (struct net_device * dev )
168159{
169160 port_t * port = dev_to_port (dev );
@@ -177,17 +168,13 @@ static int pc300_open(struct net_device *dev)
177168 return 0 ;
178169}
179170
180-
181-
182171static int pc300_close (struct net_device * dev )
183172{
184173 sca_close (dev );
185174 hdlc_close (dev );
186175 return 0 ;
187176}
188177
189-
190-
191178static int pc300_ioctl (struct net_device * dev , struct ifreq * ifr , int cmd )
192179{
193180 const size_t size = sizeof (sync_serial_settings );
@@ -214,7 +201,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
214201 if (copy_to_user (line , & port -> settings , size ))
215202 return - EFAULT ;
216203 return 0 ;
217-
218204 }
219205
220206 if (port -> card -> type == PC300_X21 &&
@@ -255,8 +241,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
255241 return 0 ;
256242}
257243
258-
259-
260244static void pc300_pci_remove_one (struct pci_dev * pdev )
261245{
262246 int i ;
@@ -472,8 +456,6 @@ static int pc300_pci_init_one(struct pci_dev *pdev,
472456 return 0 ;
473457}
474458
475-
476-
477459static const struct pci_device_id pc300_pci_tbl [] = {
478460 { PCI_VENDOR_ID_CYCLADES , PCI_DEVICE_ID_PC300_RX_1 , PCI_ANY_ID ,
479461 PCI_ANY_ID , 0 , 0 , 0 },
@@ -486,15 +468,13 @@ static const struct pci_device_id pc300_pci_tbl[] = {
486468 { 0 , }
487469};
488470
489-
490471static struct pci_driver pc300_pci_driver = {
491472 .name = "PC300" ,
492473 .id_table = pc300_pci_tbl ,
493474 .probe = pc300_pci_init_one ,
494475 .remove = pc300_pci_remove_one ,
495476};
496477
497-
498478static int __init pc300_init_module (void )
499479{
500480 if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000 ) {
@@ -511,8 +491,6 @@ static int __init pc300_init_module(void)
511491 return pci_register_driver (& pc300_pci_driver );
512492}
513493
514-
515-
516494static void __exit pc300_cleanup_module (void )
517495{
518496 pci_unregister_driver (& pc300_pci_driver );
0 commit comments