It violates kernel code style guidelines to define typedefs for non-opaque types. Update rtl8150 to conform to these guidelines by expanding the rtl8150_t typedef. Also remove a few extra spaces after the * in pointer declarations to adhere to kernel code style. Signed-off-by: Ethan Nelson-Moore --- drivers/net/usb/rtl8150.c | 68 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index e40b0669d9f4..142bd468b2a3 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -144,8 +144,6 @@ struct rtl8150 { u8 phy; }; -typedef struct rtl8150 rtl8150_t; - struct async_req { struct usb_ctrlrequest dr; u16 rx_creg; @@ -158,14 +156,14 @@ static const char driver_name [] = "rtl8150"; ** device related part of the code ** */ -static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data) +static int get_registers(struct rtl8150 *dev, u16 indx, u16 size, void *data) { return usb_control_msg_recv(dev->udev, 0, RTL8150_REQ_GET_REGS, RTL8150_REQT_READ, indx, 0, data, size, 1000, GFP_NOIO); } -static int set_registers(rtl8150_t * dev, u16 indx, u16 size, const void *data) +static int set_registers(struct rtl8150 *dev, u16 indx, u16 size, const void *data) { return usb_control_msg_send(dev->udev, 0, RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE, indx, 0, data, size, @@ -183,7 +181,7 @@ static void async_set_reg_cb(struct urb *urb) usb_free_urb(urb); } -static int async_set_registers(rtl8150_t *dev, u16 indx, u16 size, u16 reg) +static int async_set_registers(struct rtl8150 *dev, u16 indx, u16 size, u16 reg) { int res = -ENOMEM; struct urb *async_urb; @@ -217,7 +215,7 @@ static int async_set_registers(rtl8150_t *dev, u16 indx, u16 size, u16 reg) return res; } -static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg) +static int read_mii_word(struct rtl8150 *dev, u8 phy, __u8 indx, u16 *reg) { int i; u8 data[3], tmp; @@ -241,7 +239,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg) return 1; } -static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg) +static int write_mii_word(struct rtl8150 *dev, u8 phy, __u8 indx, u16 reg) { int i; u8 data[3], tmp; @@ -264,7 +262,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg) return 1; } -static void set_ethernet_addr(rtl8150_t *dev) +static void set_ethernet_addr(struct rtl8150 *dev) { u8 node_id[ETH_ALEN]; int ret; @@ -283,7 +281,7 @@ static void set_ethernet_addr(rtl8150_t *dev) static int rtl8150_set_mac_address(struct net_device *netdev, void *p) { struct sockaddr *addr = p; - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); if (netif_running(netdev)) return -EBUSY; @@ -315,7 +313,7 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p) return 0; } -static int rtl8150_reset(rtl8150_t * dev) +static int rtl8150_reset(struct rtl8150 *dev) { u8 data = 0x10; int i = HZ; @@ -328,7 +326,7 @@ static int rtl8150_reset(rtl8150_t * dev) return (i > 0) ? 1 : 0; } -static int alloc_all_urbs(rtl8150_t * dev) +static int alloc_all_urbs(struct rtl8150 *dev) { dev->rx_urb = usb_alloc_urb(0, GFP_KERNEL); if (!dev->rx_urb) @@ -348,21 +346,21 @@ static int alloc_all_urbs(rtl8150_t * dev) return 1; } -static void free_all_urbs(rtl8150_t * dev) +static void free_all_urbs(struct rtl8150 *dev) { usb_free_urb(dev->rx_urb); usb_free_urb(dev->tx_urb); usb_free_urb(dev->intr_urb); } -static void unlink_all_urbs(rtl8150_t * dev) +static void unlink_all_urbs(struct rtl8150 *dev) { usb_kill_urb(dev->rx_urb); usb_kill_urb(dev->tx_urb); usb_kill_urb(dev->intr_urb); } -static inline struct sk_buff *pull_skb(rtl8150_t *dev) +static inline struct sk_buff *pull_skb(struct rtl8150 *dev) { struct sk_buff *skb; int i; @@ -379,7 +377,7 @@ static inline struct sk_buff *pull_skb(rtl8150_t *dev) static void read_bulk_callback(struct urb *urb) { - rtl8150_t *dev; + struct rtl8150 *dev; unsigned pkt_len, res; struct sk_buff *skb; struct net_device *netdev; @@ -453,7 +451,7 @@ static void read_bulk_callback(struct urb *urb) static void write_bulk_callback(struct urb *urb) { - rtl8150_t *dev; + struct rtl8150 *dev; int status = urb->status; dev = urb->context; @@ -471,7 +469,7 @@ static void write_bulk_callback(struct urb *urb) static void intr_callback(struct urb *urb) { - rtl8150_t *dev; + struct rtl8150 *dev; __u8 *d; int status = urb->status; int res; @@ -528,7 +526,7 @@ static void intr_callback(struct urb *urb) static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message) { - rtl8150_t *dev = usb_get_intfdata(intf); + struct rtl8150 *dev = usb_get_intfdata(intf); netif_device_detach(dev->netdev); @@ -541,7 +539,7 @@ static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message) static int rtl8150_resume(struct usb_interface *intf) { - rtl8150_t *dev = usb_get_intfdata(intf); + struct rtl8150 *dev = usb_get_intfdata(intf); netif_device_attach(dev->netdev); if (netif_running(dev->netdev)) { @@ -562,7 +560,7 @@ static int rtl8150_resume(struct usb_interface *intf) ** */ -static void fill_skb_pool(rtl8150_t *dev) +static void fill_skb_pool(struct rtl8150 *dev) { struct sk_buff *skb; int i; @@ -579,7 +577,7 @@ static void fill_skb_pool(rtl8150_t *dev) } } -static void free_skb_pool(rtl8150_t *dev) +static void free_skb_pool(struct rtl8150 *dev) { int i; @@ -623,7 +621,7 @@ static void rx_fixup(struct tasklet_struct *t) tasklet_schedule(&dev->tl); } -static int enable_net_traffic(rtl8150_t * dev) +static int enable_net_traffic(struct rtl8150 *dev) { u8 cr, tcr, rcr, msr; @@ -644,7 +642,7 @@ static int enable_net_traffic(rtl8150_t * dev) return 0; } -static void disable_net_traffic(rtl8150_t * dev) +static void disable_net_traffic(struct rtl8150 *dev) { u8 cr; @@ -655,7 +653,7 @@ static void disable_net_traffic(rtl8150_t * dev) static void rtl8150_tx_timeout(struct net_device *netdev, unsigned int txqueue) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); dev_warn(&netdev->dev, "Tx timeout.\n"); usb_unlink_urb(dev->tx_urb); netdev->stats.tx_errors++; @@ -663,7 +661,7 @@ static void rtl8150_tx_timeout(struct net_device *netdev, unsigned int txqueue) static void rtl8150_set_multicast(struct net_device *netdev) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); u16 rx_creg = 0x9e; if (netdev->flags & IFF_PROMISC) { @@ -684,7 +682,7 @@ static void rtl8150_set_multicast(struct net_device *netdev) static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); int count, res; /* pad the frame and ensure terminating USB packet, datasheet 9.2.3 */ @@ -721,7 +719,7 @@ static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb, static void set_carrier(struct net_device *netdev) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); short tmp; get_registers(dev, CSCR, 2, &tmp); @@ -733,7 +731,7 @@ static void set_carrier(struct net_device *netdev) static int rtl8150_open(struct net_device *netdev) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); int res; if (dev->rx_skb == NULL) @@ -770,7 +768,7 @@ static int rtl8150_open(struct net_device *netdev) static int rtl8150_close(struct net_device *netdev) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); netif_stop_queue(netdev); if (!test_bit(RTL8150_UNPLUG, &dev->flags)) @@ -782,7 +780,7 @@ static int rtl8150_close(struct net_device *netdev) static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); strscpy(info->driver, driver_name, sizeof(info->driver)); strscpy(info->version, DRIVER_VERSION, sizeof(info->version)); @@ -792,7 +790,7 @@ static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinf static int rtl8150_get_link_ksettings(struct net_device *netdev, struct ethtool_link_ksettings *ecmd) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); short lpa = 0; short bmcr = 0; u32 supported; @@ -841,7 +839,7 @@ static const struct ethtool_ops ops = { static int rtl8150_siocdevprivate(struct net_device *netdev, struct ifreq *rq, void __user *udata, int cmd) { - rtl8150_t *dev = netdev_priv(netdev); + struct rtl8150 *dev = netdev_priv(netdev); u16 *data = (u16 *) & rq->ifr_ifru; int res = 0; @@ -880,7 +878,7 @@ static int rtl8150_probe(struct usb_interface *intf, const struct usb_device_id *id) { struct usb_device *udev = interface_to_usbdev(intf); - rtl8150_t *dev; + struct rtl8150 *dev; struct net_device *netdev; static const u8 bulk_ep_addr[] = { RTL8150_USB_EP_BULK_IN | USB_DIR_IN, @@ -890,7 +888,7 @@ static int rtl8150_probe(struct usb_interface *intf, RTL8150_USB_EP_INT_IN | USB_DIR_IN, 0}; - netdev = alloc_etherdev(sizeof(rtl8150_t)); + netdev = alloc_etherdev(sizeof(struct rtl8150)); if (!netdev) return -ENOMEM; @@ -954,7 +952,7 @@ static int rtl8150_probe(struct usb_interface *intf, static void rtl8150_disconnect(struct usb_interface *intf) { - rtl8150_t *dev = usb_get_intfdata(intf); + struct rtl8150 *dev = usb_get_intfdata(intf); usb_set_intfdata(intf, NULL); if (dev) { -- 2.43.0 It violates kernel code style guidelines to define typedefs for non-opaque types. Update pegasus to conform to these guidelines by expanding the pegasus_t typedef. Also replace a few tabs before * in struct pegasus variable declarations with spaces. Signed-off-by: Ethan Nelson-Moore --- drivers/net/usb/pegasus.c | 92 +++++++++++++++++++-------------------- drivers/net/usb/pegasus.h | 4 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index c514483134f0..a85ffb04fc2b 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -97,14 +97,14 @@ static void async_ctrl_callback(struct urb *urb) usb_free_urb(urb); } -static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data) +static int get_registers(struct pegasus *pegasus, __u16 indx, __u16 size, void *data) { return usb_control_msg_recv(pegasus->usb, 0, PEGASUS_REQ_GET_REGS, PEGASUS_REQT_READ, 0, indx, data, size, 1000, GFP_NOIO); } -static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, +static int set_registers(struct pegasus *pegasus, __u16 indx, __u16 size, const void *data) { int ret; @@ -123,7 +123,7 @@ static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, * specific control request. 'data' is ignored by the device, but it is here to * not break the API. */ -static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data) +static int set_register(struct pegasus *pegasus, __u16 indx, __u8 data) { void *buf = &data; int ret; @@ -137,7 +137,7 @@ static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data) return ret; } -static int update_eth_regs_async(pegasus_t *pegasus) +static int update_eth_regs_async(struct pegasus *pegasus) { int ret = -ENOMEM; struct urb *async_urb; @@ -174,7 +174,7 @@ static int update_eth_regs_async(pegasus_t *pegasus) return ret; } -static int __mii_op(pegasus_t *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd) +static int __mii_op(struct pegasus *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd) { int i, ret; __le16 regdi; @@ -211,20 +211,20 @@ static int __mii_op(pegasus_t *p, __u8 phy, __u8 indx, __u16 *regd, __u8 cmd) } /* Returns non-negative int on success, error on failure */ -static int read_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd) +static int read_mii_word(struct pegasus *pegasus, __u8 phy, __u8 indx, __u16 *regd) { return __mii_op(pegasus, phy, indx, regd, PHY_READ); } /* Returns zero on success, error on failure */ -static int write_mii_word(pegasus_t *pegasus, __u8 phy, __u8 indx, __u16 *regd) +static int write_mii_word(struct pegasus *pegasus, __u8 phy, __u8 indx, __u16 *regd) { return __mii_op(pegasus, phy, indx, regd, PHY_WRITE); } static int mdio_read(struct net_device *dev, int phy_id, int loc) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); int ret; u16 res; @@ -237,13 +237,13 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc) static void mdio_write(struct net_device *dev, int phy_id, int loc, int val) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); u16 data = val; write_mii_word(pegasus, phy_id, loc, &data); } -static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata) +static int read_eprom_word(struct pegasus *pegasus, __u8 index, __u16 *retdata) { int ret, i; __le16 retdatai; @@ -277,7 +277,7 @@ static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata) } #ifdef PEGASUS_WRITE_EEPROM -static inline void enable_eprom_write(pegasus_t *pegasus) +static inline void enable_eprom_write(struct pegasus *pegasus) { __u8 tmp; @@ -285,7 +285,7 @@ static inline void enable_eprom_write(pegasus_t *pegasus) set_register(pegasus, EthCtrl2, tmp | EPROM_WR_ENABLE); } -static inline void disable_eprom_write(pegasus_t *pegasus) +static inline void disable_eprom_write(struct pegasus *pegasus) { __u8 tmp; @@ -294,7 +294,7 @@ static inline void disable_eprom_write(pegasus_t *pegasus) set_register(pegasus, EthCtrl2, tmp & ~EPROM_WR_ENABLE); } -static int write_eprom_word(pegasus_t *pegasus, __u8 index, __u16 data) +static int write_eprom_word(struct pegasus *pegasus, __u8 index, __u16 data) { int i; __u8 tmp, d[4] = { 0x3f, 0, 0, EPROM_WRITE }; @@ -326,7 +326,7 @@ static int write_eprom_word(pegasus_t *pegasus, __u8 index, __u16 data) } #endif /* PEGASUS_WRITE_EEPROM */ -static inline int get_node_id(pegasus_t *pegasus, u8 *id) +static inline int get_node_id(struct pegasus *pegasus, u8 *id) { int i, ret; u16 w16; @@ -341,7 +341,7 @@ static inline int get_node_id(pegasus_t *pegasus, u8 *id) return 0; } -static void set_ethernet_addr(pegasus_t *pegasus) +static void set_ethernet_addr(struct pegasus *pegasus) { int ret; u8 node_id[6]; @@ -369,7 +369,7 @@ static void set_ethernet_addr(pegasus_t *pegasus) return; } -static inline int reset_mac(pegasus_t *pegasus) +static inline int reset_mac(struct pegasus *pegasus) { int ret, i; __u8 data = 0x8; @@ -416,7 +416,7 @@ static inline int reset_mac(pegasus_t *pegasus) static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); int ret; __u16 linkpart; __u8 data[4]; @@ -456,7 +456,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) static void read_bulk_callback(struct urb *urb) { - pegasus_t *pegasus = urb->context; + struct pegasus *pegasus = urb->context; struct net_device *net; u8 *buf = urb->transfer_buffer; int rx_status, count = urb->actual_length; @@ -566,7 +566,7 @@ static void read_bulk_callback(struct urb *urb) static void rx_fixup(struct tasklet_struct *t) { - pegasus_t *pegasus = from_tasklet(pegasus, t, rx_tl); + struct pegasus *pegasus = from_tasklet(pegasus, t, rx_tl); int status; if (pegasus->flags & PEGASUS_UNPLUG) @@ -602,7 +602,7 @@ static void rx_fixup(struct tasklet_struct *t) static void write_bulk_callback(struct urb *urb) { - pegasus_t *pegasus = urb->context; + struct pegasus *pegasus = urb->context; struct net_device *net; int status = urb->status; @@ -638,7 +638,7 @@ static void write_bulk_callback(struct urb *urb) static void intr_callback(struct urb *urb) { - pegasus_t *pegasus = urb->context; + struct pegasus *pegasus = urb->context; struct net_device *net; int res, status = urb->status; @@ -694,7 +694,7 @@ static void intr_callback(struct urb *urb) static void pegasus_tx_timeout(struct net_device *net, unsigned int txqueue) { - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); netif_warn(pegasus, timer, net, "tx timeout\n"); usb_unlink_urb(pegasus->tx_urb); net->stats.tx_errors++; @@ -703,7 +703,7 @@ static void pegasus_tx_timeout(struct net_device *net, unsigned int txqueue) static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb, struct net_device *net) { - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); int count = ((skb->len + 2) & 0x3f) ? skb->len + 2 : skb->len + 3; int res; __u16 l16 = skb->len; @@ -739,14 +739,14 @@ static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; } -static inline void disable_net_traffic(pegasus_t *pegasus) +static inline void disable_net_traffic(struct pegasus *pegasus) { __le16 tmp = cpu_to_le16(0); set_registers(pegasus, EthCtrl0, sizeof(tmp), &tmp); } -static inline int get_interrupt_interval(pegasus_t *pegasus) +static inline int get_interrupt_interval(struct pegasus *pegasus) { u16 data; u8 interval; @@ -776,7 +776,7 @@ static inline int get_interrupt_interval(pegasus_t *pegasus) static void set_carrier(struct net_device *net) { - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); u16 tmp; if (read_mii_word(pegasus, pegasus->phy, MII_BMSR, &tmp)) @@ -788,21 +788,21 @@ static void set_carrier(struct net_device *net) netif_carrier_off(net); } -static void free_all_urbs(pegasus_t *pegasus) +static void free_all_urbs(struct pegasus *pegasus) { usb_free_urb(pegasus->intr_urb); usb_free_urb(pegasus->tx_urb); usb_free_urb(pegasus->rx_urb); } -static void unlink_all_urbs(pegasus_t *pegasus) +static void unlink_all_urbs(struct pegasus *pegasus) { usb_kill_urb(pegasus->intr_urb); usb_kill_urb(pegasus->tx_urb); usb_kill_urb(pegasus->rx_urb); } -static int alloc_urbs(pegasus_t *pegasus) +static int alloc_urbs(struct pegasus *pegasus) { int res = -ENOMEM; @@ -827,7 +827,7 @@ static int alloc_urbs(pegasus_t *pegasus) static int pegasus_open(struct net_device *net) { - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); int res=-ENOMEM; if (pegasus->rx_skb == NULL) @@ -880,7 +880,7 @@ static int pegasus_open(struct net_device *net) static int pegasus_close(struct net_device *net) { - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); netif_stop_queue(net); if (!(pegasus->flags & PEGASUS_UNPLUG)) @@ -894,7 +894,7 @@ static int pegasus_close(struct net_device *net) static void pegasus_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); strscpy(info->driver, driver_name, sizeof(info->driver)); usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info)); @@ -906,7 +906,7 @@ static void pegasus_get_drvinfo(struct net_device *dev, static void pegasus_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); wol->supported = WAKE_MAGIC | WAKE_PHY; wol->wolopts = pegasus->wolopts; @@ -915,7 +915,7 @@ pegasus_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) static int pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); u8 reg78 = 0x04; int ret; @@ -952,7 +952,7 @@ static int pegasus_get_link_ksettings(struct net_device *dev, struct ethtool_link_ksettings *ecmd) { - pegasus_t *pegasus; + struct pegasus *pegasus; pegasus = netdev_priv(dev); mii_ethtool_get_link_ksettings(&pegasus->mii, ecmd); @@ -963,31 +963,31 @@ static int pegasus_set_link_ksettings(struct net_device *dev, const struct ethtool_link_ksettings *ecmd) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); return mii_ethtool_set_link_ksettings(&pegasus->mii, ecmd); } static int pegasus_nway_reset(struct net_device *dev) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); return mii_nway_restart(&pegasus->mii); } static u32 pegasus_get_link(struct net_device *dev) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); return mii_link_ok(&pegasus->mii); } static u32 pegasus_get_msglevel(struct net_device *dev) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); return pegasus->msg_enable; } static void pegasus_set_msglevel(struct net_device *dev, u32 v) { - pegasus_t *pegasus = netdev_priv(dev); + struct pegasus *pegasus = netdev_priv(dev); pegasus->msg_enable = v; } @@ -1007,7 +1007,7 @@ static int pegasus_siocdevprivate(struct net_device *net, struct ifreq *rq, void __user *udata, int cmd) { __u16 *data = (__u16 *) &rq->ifr_ifru; - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); int res; switch (cmd) { @@ -1031,7 +1031,7 @@ static int pegasus_siocdevprivate(struct net_device *net, struct ifreq *rq, static void pegasus_set_multicast(struct net_device *net) { - pegasus_t *pegasus = netdev_priv(net); + struct pegasus *pegasus = netdev_priv(net); if (net->flags & IFF_PROMISC) { pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS; @@ -1047,7 +1047,7 @@ static void pegasus_set_multicast(struct net_device *net) update_eth_regs_async(pegasus); } -static __u8 mii_phy_probe(pegasus_t *pegasus) +static __u8 mii_phy_probe(struct pegasus *pegasus) { int i, ret; __u16 tmp; @@ -1065,7 +1065,7 @@ static __u8 mii_phy_probe(pegasus_t *pegasus) return 0xff; } -static inline void setup_pegasus_II(pegasus_t *pegasus) +static inline void setup_pegasus_II(struct pegasus *pegasus) { int ret; __u8 data = 0xa5; @@ -1104,7 +1104,7 @@ static inline void setup_pegasus_II(pegasus_t *pegasus) static void check_carrier(struct work_struct *work) { - pegasus_t *pegasus = container_of(work, pegasus_t, carrier_check.work); + struct pegasus *pegasus = container_of(work, struct pegasus, carrier_check.work); set_carrier(pegasus->net); if (!(pegasus->flags & PEGASUS_UNPLUG)) { queue_delayed_work(system_long_wq, &pegasus->carrier_check, @@ -1133,7 +1133,7 @@ static int pegasus_probe(struct usb_interface *intf, { struct usb_device *dev = interface_to_usbdev(intf); struct net_device *net; - pegasus_t *pegasus; + struct pegasus *pegasus; int dev_index = id - pegasus_ids; int res = -ENOMEM; diff --git a/drivers/net/usb/pegasus.h b/drivers/net/usb/pegasus.h index a05b143155ba..6810adf43f78 100644 --- a/drivers/net/usb/pegasus.h +++ b/drivers/net/usb/pegasus.h @@ -76,7 +76,7 @@ enum pegasus_registers { }; -typedef struct pegasus { +struct pegasus { struct usb_device *usb; struct usb_interface *intf; struct net_device *net; @@ -97,7 +97,7 @@ typedef struct pegasus { __u8 eth_regs[4]; __u8 phy; __u8 gpio_res; -} pegasus_t; +}; struct usb_eth_dev { -- 2.43.0 It violates kernel code style guidelines to define typedefs for non-opaque types. Update kaweth to conform to these guidelines by expanding the eth_addr_t typedef. Also replace the hardcoded MAC address length of 6 bytes with ETH_ALEN, and use standard kernel APIs to assign and compare against the broadcast address. Signed-off-by: Ethan Nelson-Moore --- drivers/net/usb/kaweth.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index c9efb7df892e..f3fe76e46490 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c @@ -164,8 +164,6 @@ static struct usb_driver kaweth_driver = { .disable_hub_initiated_lpm = 1, }; -typedef __u8 eth_addr_t[6]; - /**************************************************************** * usb_eth_dev ****************************************************************/ @@ -185,7 +183,7 @@ struct kaweth_ethernet_configuration __u8 size; __u8 reserved1; __u8 reserved2; - eth_addr_t hw_addr; + u8 hw_addr[ETH_ALEN]; __u32 statistics_mask; __le16 segment_size; __u16 max_multicast_filters; @@ -882,7 +880,6 @@ static int kaweth_probe( struct usb_device *udev = interface_to_usbdev(intf); struct kaweth_device *kaweth; struct net_device *netdev; - const eth_addr_t bcast_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; int result = 0; int rv = -EIO; @@ -991,9 +988,7 @@ static int kaweth_probe( dev_info(dev, "MTU: %d\n", le16_to_cpu(kaweth->configuration.segment_size)); dev_info(dev, "Read MAC address %pM\n", kaweth->configuration.hw_addr); - if(!memcmp(&kaweth->configuration.hw_addr, - &bcast_addr, - sizeof(bcast_addr))) { + if (is_broadcast_ether_addr((const u8 *)&kaweth->configuration.hw_addr)) { dev_err(dev, "Firmware not functioning properly, no net device created\n"); goto err_free_netdev; } @@ -1043,7 +1038,7 @@ static int kaweth_probe( if (!kaweth->rx_buf) goto err_all_but_rxbuf; - memcpy(netdev->broadcast, &bcast_addr, sizeof(bcast_addr)); + eth_broadcast_addr(netdev->broadcast); eth_hw_addr_set(netdev, (u8 *)&kaweth->configuration.hw_addr); netdev->netdev_ops = &kaweth_netdev_ops; -- 2.43.0