m68k/atari: ARAnyM - Remove bogus line from Kconfig help
Geert Uytterhoeven
maintainerPATCH 1/4 m68k/atari: ARAnyM - Remove bogus line from Kconfig help
--- arch/m68k/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/m68k/Kconfig +1 -1
@@ -255,7 +255,7 @@ config NATFEAT depends on ATARI help This option enables support for ARAnyM native features, such as - access to a disk image as /dev/hda. Useful with the ARANYM option. + access to a disk image as /dev/hda. config NFETH tristate "NatFeat Ethernet support"
Signature · 1 line
1.7.0.4
Geert Uytterhoeven
maintainerPATCH 2/4 m68k/atari: ARAnyM - Prepare nfblock for submission
- Make needlessly global functions static,
- Make struct block_device_operations const,
- Use pr_*(),
- Propagate error code from register_blkdev().
--- arch/m68k/emu/nfblock.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
arch/m68k/emu/nfblock.c +7 -7
@@ -79,7 +79,7 @@ static int nfhd_make_request(struct request_queue *queue, struct bio *bio)return 0 ; } -int nfhd_getgeo (struct block_device *bdev,struct hd_geometry *geo) +static int nfhd_getgeo (struct block_device *bdev,struct hd_geometry *geo) {struct nfhd_device *dev = bdev->bd_disk->private_data;
@@ -90,7 +90,7 @@ int nfhd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -static struct block_device_operations nfhd_ops = { +static const struct block_device_operations nfhd_ops = { .owner =THIS_MODULE , .getgeo = nfhd_getgeo, };
@@ -100,11 +100,11 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize)struct nfhd_device *dev;int dev_id = id -NFHD_DEV_OFFSET ; -printk (KERN_INFO "nfhd%u: found device with %u blocks (%u bytes)\n" , - dev_id, blocks, bsize); +pr_info ("nfhd%u: found device with %u blocks (%u bytes)\n" , dev_id, + blocks, bsize);if (bsize <512 || (bsize & (bsize -1 ))) { -printk (KERN_WARNING "nfhd%u: invalid block size\n" , dev_id); +pr_warn ("nfhd%u: invalid block size\n" , dev_id);return -EINVAL ; }
@@ -162,8 +162,8 @@ static int __init nfhd_init(void) major_num =register_blkdev (major_num,"nfhd" );if (major_num <=0 ) { -printk (KERN_WARNING "nfhd: unable to get major number\n" ); -return -ENODEV ; +pr_warn ("nfhd: unable to get major number\n" ); +return major_num; }for (i =NFHD_DEV_OFFSET ; i <24 ; i++) {
Signature · 1 line
1.7.0.4
Geert Uytterhoeven
maintainerPATCH 3/4 m68k/atari: ARAnyM - Prepare nfcon for submission
In reply to Geert Uytterhoeven - Break too long lines,
- Make needlessly global functions static,
- Use pr_*(),
- Extract nfputs(), to avoid code duplication in nfcon_write() and
nfcon_tty_write().
--- arch/m68k/emu/nfcon.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-)
arch/m68k/emu/nfcon.c +12 -18
@@ -21,7 +21,7 @@static int stderr_id;static struct tty_driver *nfcon_tty_driver; -static void nfcon_write (struct console *con,const char *str,unsigned int count) +static void nfputs (const char *str,unsigned int count) {char buf[68 ];
@@ -37,7 +37,13 @@ static void nfcon_write(struct console *con, const char *str, unsigned int countnf_call (stderr_id, buf); } -struct tty_driver *nfcon_device (struct console *con,int *index) +static void nfcon_write (struct console *con,const char *str, +unsigned int count) +{ +nfputs (str, count); +} + +static struct tty_driver *nfcon_device (struct console *con,int *index) { *index =0 ;return (con->flags &CON_ENABLED ) ? nfcon_tty_driver :NULL ;
@@ -61,22 +67,10 @@ static void nfcon_tty_close(struct tty_struct *tty, struct file *filp) { } -static int nfcon_tty_write (struct tty_struct *tty,const unsigned char *buf,int count) +static int nfcon_tty_write (struct tty_struct *tty,const unsigned char *buf, +int count) { -char temp[68 ]; -int i = count; - - temp[64 ] =0 ; -while (i >64 ) { -memcpy (temp, buf,64 ); -nf_call (stderr_id, temp); - buf +=64 ; - i -=64 ; - } -memcpy (temp, buf, i); - temp[i] =0 ; -nf_call (stderr_id, temp); - +nfputs (buf, count);return count; }
@@ -144,7 +138,7 @@ static int __init nfcon_init(void)tty_set_operations (nfcon_tty_driver, &nfcon_tty_ops); res =tty_register_driver (nfcon_tty_driver);if (res) { -printk (KERN_ERR "failed to register nfcon tty driver\n" ); +pr_err ("failed to register nfcon tty driver\n" );put_tty_driver (nfcon_tty_driver);return res; }
Signature · 1 line
1.7.0.4
Geert Uytterhoeven
maintainerPATCH 4/4 m68k/atari: ARAnyM - Prepare nfeth for submission
In reply to Geert Uytterhoeven - Break too long lines,
- Make needlessly global functions static,
- Make version[] const,
- Use pr_*(),
- Use net_device_stats from struct net_device instead of our own,
- Propagate error code from request_irq(),
- Remove unused variable "handled",
- Add missing MODULE_LICENSE.
--- arch/m68k/emu/nfeth.c | 92 ++++++++++++++++++++---------------------------- 1 files changed, 38 insertions(+), 54 deletions(-)
arch/m68k/emu/nfeth.c +38 -54
@@ -16,18 +16,18 @@#include <asm/virtconvert.h> enum { -GET_VERSION =0 ,/* no parameters, return NFAPI_VERSION in d0 */ -XIF_INTLEVEL ,/* no parameters, return Interrupt Level in d0 */ -XIF_IRQ ,/* acknowledge interrupt from host */ -XIF_START ,/* (ethX), called on 'ifup', start receiver thread */ -XIF_STOP ,/* (ethX), called on 'ifdown', stop the thread */ -XIF_READLENGTH ,/* (ethX), return size of network data block to read */ -XIF_READBLOCK ,/* (ethX, buffer, size), read block of network data */ -XIF_WRITEBLOCK ,/* (ethX, buffer, size), write block of network data */ -XIF_GET_MAC ,/* (ethX, buffer, size), return MAC HW addr in buffer */ -XIF_GET_IPHOST ,/* (ethX, buffer, size), return IP address of host */ -XIF_GET_IPATARI ,/* (ethX, buffer, size), return IP address of atari */ -XIF_GET_NETMASK /* (ethX, buffer, size), return IP netmask */ +GET_VERSION =0 ,/* no parameters, return NFAPI_VERSION in d0 */ +XIF_INTLEVEL ,/* no parameters, return Interrupt Level in d0 */ +XIF_IRQ ,/* acknowledge interrupt from host */ +XIF_START ,/* (ethX), called on 'ifup', start receiver thread */ +XIF_STOP ,/* (ethX), called on 'ifdown', stop the thread */ +XIF_READLENGTH ,/* (ethX), return size of network data block to read */ +XIF_READBLOCK ,/* (ethX, buffer, size), read block of network data */ +XIF_WRITEBLOCK ,/* (ethX, buffer, size), write block of network data */ +XIF_GET_MAC ,/* (ethX, buffer, size), return MAC HW addr in buffer */ +XIF_GET_IPHOST ,/* (ethX, buffer, size), return IP address of host */ +XIF_GET_IPATARI ,/* (ethX, buffer, size), return IP address of atari */ +XIF_GET_NETMASK /* (ethX, buffer, size), return IP netmask */ };#define DRV_NAME "nfeth"
@@ -37,9 +37,10 @@ enum {#define MAX_UNIT 8/* These identify the driver base version and may not be removed. */ -static char version[]__devinitdata = -KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " S.Opichal, M.Jurik, P.Stehlik\n" -KERN_INFO " http://aranym.atari.org/\n" ; +static const char version[]__devinitdata = + KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE +" S.Opichal, M.Jurik, P.Stehlik\n" +KERN_INFO " http://aranym.atari.org/\n" ;MODULE_AUTHOR ("Milan Jurik" );MODULE_DESCRIPTION ("Atari NFeth driver" );
@@ -55,26 +56,17 @@ static int nfEtherIRQ;struct nfeth_private {int ethX; -struct net_device_stats stats; };static struct net_device *nfeth_dev[MAX_UNIT ]; -int nfeth_open (struct net_device *dev); -int nfeth_stop (struct net_device *dev); -irqreturn_t nfeth_interrupt (int irq,void *dev_id); -int nfeth_xmit (struct sk_buff *skb,struct net_device *dev); - -int nfeth_open (struct net_device *dev) +static int nfeth_open (struct net_device *dev) {struct nfeth_private *priv =netdev_priv (dev);int res; res =nf_call (nfEtherID +XIF_START , priv->ethX); -/* Clean statistics */ -memset (&priv->stats,0 ,sizeof (struct net_device_stats )); -pr_debug (DRV_NAME ": open %d\n" , res);/* Ready for data */
@@ -83,7 +75,7 @@ int nfeth_open(struct net_device *dev)return 0 ; } -int nfeth_stop (struct net_device *dev) +static int nfeth_stop (struct net_device *dev) {struct nfeth_private *priv =netdev_priv (dev);
@@ -101,7 +93,6 @@ int nfeth_stop(struct net_device *dev)static inline void recv_packet (struct net_device *dev) {struct nfeth_private *priv =netdev_priv (dev); -int handled =0 ;unsigned short pktlen;struct sk_buff *skb;
@@ -112,7 +103,7 @@ static inline void recv_packet(struct net_device *dev)if (!pktlen) {pr_debug (DRV_NAME ": recv_packet: pktlen == 0\n" ); - priv->stats.rx_errors++; + dev->stats.rx_errors++;return ; }
@@ -120,7 +111,7 @@ static inline void recv_packet(struct net_device *dev)if (!skb) {pr_debug (DRV_NAME ": recv_packet: out of mem (buf_alloc failed)\n" ); - priv->stats.rx_dropped++; + dev->stats.rx_dropped++;return ; }
@@ -133,15 +124,14 @@ static inline void recv_packet(struct net_device *dev) skb->protocol =eth_type_trans (skb, dev);netif_rx (skb); dev->last_rx = jiffies; - priv->stats.rx_packets++; - priv->stats.rx_bytes += pktlen; + dev->stats.rx_packets++; + dev->stats.rx_bytes += pktlen;/* and enqueue packet */ - handled =1 ;return ; } -irqreturn_t nfeth_interrupt (int irq,void *dev_id) +static irqreturn_t nfeth_interrupt (int irq,void *dev_id) {int i, m, mask;
@@ -155,7 +145,7 @@ irqreturn_t nfeth_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -int nfeth_xmit (struct sk_buff *skb,struct net_device *dev) +static int nfeth_xmit (struct sk_buff *skb,struct net_device *dev) {int len;char *data, shortpkt[ETH_ZLEN ];
@@ -176,8 +166,8 @@ int nfeth_xmit(struct sk_buff *skb, struct net_device *dev)nf_call (nfEtherID +XIF_WRITEBLOCK , priv->ethX,virt_to_phys (data), len); - priv->stats.tx_packets++; - priv->stats.tx_bytes += len; + dev->stats.tx_packets++; + dev->stats.tx_bytes += len;dev_kfree_skb (skb);return 0 ;
@@ -185,29 +175,21 @@ int nfeth_xmit(struct sk_buff *skb, struct net_device *dev)static void nfeth_tx_timeout (struct net_device *dev) { -struct nfeth_private *priv =netdev_priv (dev); - priv->stats.tx_errors++; + dev->stats.tx_errors++;netif_wake_queue (dev); } -static struct net_device_stats *nfeth_get_stats (struct net_device *dev) -{ -struct nfeth_private *priv =netdev_priv (dev); -return &priv->stats; -} -static const struct net_device_ops nfeth_netdev_ops = { .ndo_open = nfeth_open, .ndo_stop = nfeth_stop, .ndo_start_xmit = nfeth_xmit, .ndo_tx_timeout = nfeth_tx_timeout, - .ndo_get_stats = nfeth_get_stats, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, .ndo_set_mac_address = eth_mac_addr, }; -struct net_device *__init nfeth_probe (int unit) +static struct net_device *__init nfeth_probe (int unit) {struct net_device *dev;struct nfeth_private *priv;
@@ -247,10 +229,10 @@ struct net_device * __init nfeth_probe(int unit)return dev; } -int __init nfeth_init (void ) +static int __init nfeth_init (void ) {long ver; -int i; +int error, i; nfEtherID =nf_get_id ("ETHERNET" );if (!nfEtherID)
@@ -260,11 +242,11 @@ int __init nfeth_init(void)pr_info ("nfeth API %lu\n" , ver); nfEtherIRQ =nf_call (nfEtherID +XIF_INTLEVEL ); -if (request_irq (nfEtherIRQ, nfeth_interrupt,IRQF_SHARED , -"eth emu" , nfeth_interrupt)) { -printk (KERN_ERR "nfeth: request for irq %d failed" , - nfEtherIRQ); -return -ENODEV ; + error =request_irq (nfEtherIRQ, nfeth_interrupt,IRQF_SHARED , +"eth emu" , nfeth_interrupt); +if (error) { +pr_err ("nfeth: request for irq %d failed" , nfEtherIRQ); +return error; }for (i =0 ; i <MAX_UNIT ; i++)
@@ -273,7 +255,7 @@ int __init nfeth_init(void)return 0 ; } -void __exit nfeth_cleanup(void) +static void __exit nfeth_cleanup(void) {int i;
@@ -288,3 +270,5 @@ void __exit nfeth_cleanup(void)module_init (nfeth_init);module_exit (nfeth_cleanup); + +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.7.0.4
Geert Uytterhoeven
maintainerRe: [PATCH 4/4] m68k/atari: ARAnyM - Prepare nfeth for submission
Quoted 1 line · Geert Uytterhoeven
- Add missing
MODULE_LICENSE.
Sorry, this one was bogus: there's already one hidden in the middle of the file.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds