From 929f86c30eb030b6eb52c44326a1b4d4a57aa2c6 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 6 Sep 2007 19:35:08 +0000 Subject: cosmetic fixes for ar7: indent, use lowercase hex notation, format SVN-Revision: 8656 --- .../ar7/files/drivers/char/watchdog/ar7_wdt.c | 74 ++++++++++----------- target/linux/ar7/files/drivers/net/cpmac.c | 76 +++++++++++----------- 2 files changed, 75 insertions(+), 75 deletions(-) (limited to 'target/linux/ar7/files/drivers') diff --git a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c index 50dfb5ef3c..2710250086 100644 --- a/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c +++ b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c @@ -71,7 +71,7 @@ static struct semaphore open_semaphore; static unsigned expect_close; /* XXX currently fixed, allows max margin ~68.72 secs */ -#define prescale_value 0xFFFF +#define prescale_value 0xffff // Offset of the WDT registers static unsigned long ar7_regs_wdt; @@ -79,37 +79,37 @@ static unsigned long ar7_regs_wdt; static ar7_wdt_t *ar7_wdt; static void ar7_wdt_get_regs(void) { - u16 chip_id = ar7_chip_id(); - switch (chip_id) - { - case AR7_CHIP_7100: - case AR7_CHIP_7200: - ar7_regs_wdt = AR7_REGS_WDT; - break; - default: - ar7_regs_wdt = UR8_REGS_WDT; - break; - } + u16 chip_id = ar7_chip_id(); + switch (chip_id) + { + case AR7_CHIP_7100: + case AR7_CHIP_7200: + ar7_regs_wdt = AR7_REGS_WDT; + break; + default: + ar7_regs_wdt = UR8_REGS_WDT; + break; + } } - + static void ar7_wdt_kick(u32 value) { ar7_wdt->kick_lock = 0x5555; if ((ar7_wdt->kick_lock & 3) == 1) { - ar7_wdt->kick_lock = 0xAAAA; + ar7_wdt->kick_lock = 0xaaaa; if ((ar7_wdt->kick_lock & 3) == 3) { ar7_wdt->kick = value; return; } - } - printk(KERN_ERR DRVNAME ": failed to unlock WDT kick reg\n"); + } + printk(KERN_ERR DRVNAME ": failed to unlock WDT kick reg\n"); } static void ar7_wdt_prescale(u32 value) { - ar7_wdt->prescale_lock = 0x5A5A; + ar7_wdt->prescale_lock = 0x5a5a; if ((ar7_wdt->prescale_lock & 3) == 1) { - ar7_wdt->prescale_lock = 0xA5A5; + ar7_wdt->prescale_lock = 0xa5a5; if ((ar7_wdt->prescale_lock & 3) == 3) { ar7_wdt->prescale = value; return; @@ -122,7 +122,7 @@ static void ar7_wdt_change(u32 value) { ar7_wdt->change_lock = 0x6666; if ((ar7_wdt->change_lock & 3) == 1) { - ar7_wdt->change_lock = 0xBBBB; + ar7_wdt->change_lock = 0xbbbb; if ((ar7_wdt->change_lock & 3) == 3) { ar7_wdt->change = value; return; @@ -135,9 +135,9 @@ static void ar7_wdt_disable(u32 value) { ar7_wdt->disable_lock = 0x7777; if ((ar7_wdt->disable_lock & 3) == 1) { - ar7_wdt->disable_lock = 0xCCCC; + ar7_wdt->disable_lock = 0xcccc; if ((ar7_wdt->disable_lock & 3) == 2) { - ar7_wdt->disable_lock = 0xDDDD; + ar7_wdt->disable_lock = 0xdddd; if ((ar7_wdt->disable_lock & 3) == 3) { ar7_wdt->disable = value; return; @@ -153,7 +153,7 @@ static void ar7_wdt_update_margin(int new_margin) change = new_margin * (ar7_vbus_freq() / prescale_value); if (change < 1) change = 1; - if (change > 0xFFFF) change = 0xFFFF; + if (change > 0xffff) change = 0xffff; ar7_wdt_change(change); margin = change * prescale_value / ar7_vbus_freq(); printk(KERN_INFO DRVNAME @@ -192,19 +192,19 @@ static int ar7_wdt_release(struct inode *inode, struct file *file) } else if (!nowayout) { ar7_wdt_disable_wdt(); } - up(&open_semaphore); + up(&open_semaphore); return 0; } static int ar7_wdt_notify_sys(struct notifier_block *this, - unsigned long code, void *unused) + unsigned long code, void *unused) { if (code == SYS_HALT || code == SYS_POWER_OFF) if (!nowayout) ar7_wdt_disable_wdt(); - return NOTIFY_DONE; + return NOTIFY_DONE; } static struct notifier_block ar7_wdt_notifier = @@ -213,7 +213,7 @@ static struct notifier_block ar7_wdt_notifier = }; static ssize_t ar7_wdt_write(struct file *file, const char *data, - size_t len, loff_t *ppos) + size_t len, loff_t *ppos) { if (ppos != &file->f_pos) return -ESPIPE; @@ -238,7 +238,7 @@ static ssize_t ar7_wdt_write(struct file *file, const char *data, } static int ar7_wdt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) + unsigned int cmd, unsigned long arg) { static struct watchdog_info ident = { .identity = LONGNAME, @@ -248,8 +248,6 @@ static int ar7_wdt_ioctl(struct inode *inode, struct file *file, int new_margin; switch (cmd) { - default: - return -ENOTTY; case WDIOC_GETSUPPORT: if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident))) @@ -276,6 +274,8 @@ static int ar7_wdt_ioctl(struct inode *inode, struct file *file, if (put_user(margin, (int *)arg)) return -EFAULT; return 0; + default: + return -ENOTTY; } } @@ -296,8 +296,8 @@ static struct miscdevice ar7_wdt_miscdev = { static int __init ar7_wdt_init(void) { int rc; - - ar7_wdt_get_regs(); + + ar7_wdt_get_regs(); if (!request_mem_region(ar7_regs_wdt, sizeof(ar7_wdt_t), LONGNAME)) { printk(KERN_WARNING DRVNAME ": watchdog I/O region busy\n"); @@ -314,15 +314,15 @@ static int __init ar7_wdt_init(void) rc = misc_register(&ar7_wdt_miscdev); if (rc) { - printk(KERN_ERR DRVNAME ": unable to register misc device\n"); + printk(KERN_ERR DRVNAME ": unable to register misc device\n"); goto out_alloc; } rc = register_reboot_notifier(&ar7_wdt_notifier); - if (rc) { - printk(KERN_ERR DRVNAME ": unable to register reboot notifier\n"); + if (rc) { + printk(KERN_ERR DRVNAME ": unable to register reboot notifier\n"); goto out_register; - } + } goto out; out_register: @@ -335,9 +335,9 @@ out: static void __exit ar7_wdt_cleanup(void) { - unregister_reboot_notifier(&ar7_wdt_notifier); + unregister_reboot_notifier(&ar7_wdt_notifier); misc_deregister(&ar7_wdt_miscdev); - iounmap(ar7_wdt); + iounmap(ar7_wdt); release_mem_region(ar7_regs_wdt, sizeof(ar7_wdt_t)); } diff --git a/target/linux/ar7/files/drivers/net/cpmac.c b/target/linux/ar7/files/drivers/net/cpmac.c index 7d46677080..7d8e1b8247 100644 --- a/target/linux/ar7/files/drivers/net/cpmac.c +++ b/target/linux/ar7/files/drivers/net/cpmac.c @@ -242,14 +242,14 @@ static void cpmac_dump_regs(u32 *base, int count) static const char *cpmac_dump_buf(const uint8_t * buf, unsigned size) { - static char buffer[3 * 25 + 1]; - char *p = &buffer[0]; - if (size > 20) - size = 20; - while (size-- > 0) { - p += sprintf(p, " %02x", *buf++); - } - return buffer; + static char buffer[3 * 25 + 1]; + char *p = &buffer[0]; + if (size > 20) + size = 20; + while (size-- > 0) { + p += sprintf(p, " %02x", *buf++); + } + return buffer; } #endif @@ -336,7 +336,7 @@ static void cpmac_set_multicast_list(struct net_device *dev) if(dev->flags & IFF_PROMISC) { priv->regs->mbp &= ~MBP_PROMISCCHAN(0); /* promisc channel 0 */ priv->regs->mbp |= MBP_RXPROMISC; - } else { + } else { priv->regs->mbp &= ~MBP_RXPROMISC; if(dev->flags & IFF_ALLMULTI) { /* enable all multicast mode */ @@ -460,8 +460,8 @@ static void cpmac_rx(struct net_device *dev) desc = priv->rx_head; dma_cache_inv((u32)desc, 16); #ifdef CPMAC_DEBUG - printk(KERN_DEBUG "%s: len=%d, %s\n", __func__, pkt->datalen, - cpmac_dump_buf(data, pkt->datalen)); + printk(KERN_DEBUG "%s: len=%d, %s\n", __func__, pkt->datalen, + cpmac_dump_buf(data, pkt->datalen)); #endif while ((desc->dataflags & CPMAC_OWN) == 0) { @@ -527,13 +527,13 @@ static int cpmac_poll(struct net_device *dev, int *budget) static void cpmac_alloc_skbs(struct work_struct *work) { - struct cpmac_priv *priv = container_of(work, struct cpmac_priv, - alloc_work); + struct cpmac_priv *priv = container_of(work, struct cpmac_priv, + alloc_work); #else static void cpmac_alloc_skbs(void *data) { - struct net_device *dev = (struct net_device*)data; + struct net_device *dev = (struct net_device*)data; struct cpmac_priv *priv = netdev_priv(dev); #endif unsigned long flags; @@ -576,7 +576,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) len = skb->len; #ifdef CPMAC_DEBUG - printk(KERN_DEBUG "%s: len=%d\n", __func__, len); //cpmac_dump_buf(const uint8_t * buf, unsigned size) + printk(KERN_DEBUG "%s: len=%d\n", __func__, len); //cpmac_dump_buf(const uint8_t * buf, unsigned size) #endif if (unlikely(len < ETH_ZLEN)) { if (unlikely(skb_padto(skb, ETH_ZLEN))) { @@ -753,42 +753,42 @@ static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int cpmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { - struct cpmac_priv *priv = netdev_priv(dev); + struct cpmac_priv *priv = netdev_priv(dev); - if (priv->phy) - return phy_ethtool_gset(priv->phy, cmd); + if (priv->phy) + return phy_ethtool_gset(priv->phy, cmd); - return -EINVAL; + return -EINVAL; } static int cpmac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { - struct cpmac_priv *priv = netdev_priv(dev); + struct cpmac_priv *priv = netdev_priv(dev); - if (!capable(CAP_NET_ADMIN)) - return -EPERM; + if (!capable(CAP_NET_ADMIN)) + return -EPERM; - if (priv->phy) - return phy_ethtool_sset(priv->phy, cmd); + if (priv->phy) + return phy_ethtool_sset(priv->phy, cmd); - return -EINVAL; + return -EINVAL; } static void cpmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "cpmac"); - strcpy(info->version, "0.0.3"); - info->fw_version[0] = '\0'; - sprintf(info->bus_info, "%s", "cpmac"); - info->regdump_len = 0; + strcpy(info->driver, "cpmac"); + strcpy(info->version, "0.0.3"); + info->fw_version[0] = '\0'; + sprintf(info->bus_info, "%s", "cpmac"); + info->regdump_len = 0; } static const struct ethtool_ops cpmac_ethtool_ops = { - .get_settings = cpmac_get_settings, - .set_settings = cpmac_set_settings, - .get_drvinfo = cpmac_get_drvinfo, - .get_link = ethtool_op_get_link, + .get_settings = cpmac_get_settings, + .set_settings = cpmac_set_settings, + .get_drvinfo = cpmac_get_drvinfo, + .get_link = ethtool_op_get_link, }; static struct net_device_stats *cpmac_stats(struct net_device *dev) @@ -806,7 +806,7 @@ static int cpmac_change_mtu(struct net_device *dev, int mtu) unsigned long flags; struct cpmac_priv *priv = netdev_priv(dev); spinlock_t *lock = &priv->lock; - + if ((mtu < 68) || (mtu > 1500)) return -EINVAL; @@ -937,9 +937,9 @@ static int cpmac_open(struct net_device *dev) priv->rx_head = &priv->desc_ring[CPMAC_TX_RING_SIZE]; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) - INIT_WORK(&priv->alloc_work, cpmac_alloc_skbs); + INIT_WORK(&priv->alloc_work, cpmac_alloc_skbs); #else - INIT_WORK(&priv->alloc_work, cpmac_alloc_skbs, dev); + INIT_WORK(&priv->alloc_work, cpmac_alloc_skbs, dev); #endif schedule_work(&priv->alloc_work); flush_scheduled_work(); @@ -961,7 +961,7 @@ static int cpmac_open(struct net_device *dev) } if((res = request_irq(dev->irq, cpmac_irq, SA_INTERRUPT, - dev->name, dev))) { + dev->name, dev))) { printk("%s: failed to obtain irq\n", dev->name); goto fail_irq; } -- cgit v1.2.3