diff options
Diffstat (limited to 'drivers/staging/unisys/visornic/visornic_main.c')
| -rw-r--r-- | drivers/staging/unisys/visornic/visornic_main.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c index 92dceb557886..3647b8f1ed28 100644 --- a/drivers/staging/unisys/visornic/visornic_main.c +++ b/drivers/staging/unisys/visornic/visornic_main.c @@ -849,7 +849,7 @@ static bool vnic_hit_low_watermark(struct visornic_devdata *devdata, * * Return: NETDEV_TX_OK. */ -static int visornic_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t visornic_xmit(struct sk_buff *skb, struct net_device *netdev) { struct visornic_devdata *devdata; int len, firstfraglen, padlen; @@ -2126,30 +2126,19 @@ static struct visor_driver visornic_driver = { */ static int visornic_init(void) { - struct dentry *ret; - int err = -ENOMEM; + int err; visornic_debugfs_dir = debugfs_create_dir("visornic", NULL); - if (!visornic_debugfs_dir) - return err; - ret = debugfs_create_file("info", 0400, visornic_debugfs_dir, NULL, - &debugfs_info_fops); - if (!ret) - goto cleanup_debugfs; - ret = debugfs_create_file("enable_ints", 0200, visornic_debugfs_dir, - NULL, &debugfs_enable_ints_fops); - if (!ret) - goto cleanup_debugfs; + debugfs_create_file("info", 0400, visornic_debugfs_dir, NULL, + &debugfs_info_fops); + debugfs_create_file("enable_ints", 0200, visornic_debugfs_dir, NULL, + &debugfs_enable_ints_fops); err = visorbus_register_visor_driver(&visornic_driver); if (err) - goto cleanup_debugfs; + debugfs_remove_recursive(visornic_debugfs_dir); - return 0; - -cleanup_debugfs: - debugfs_remove_recursive(visornic_debugfs_dir); return err; } |