diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-09-30 05:22:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-30 05:22:14 -0400 |
commit | cf04a4c764cd3e651a64b3e667bb6a673ead99e1 (patch) | |
tree | 61fc379e33ca08e68326b9f76577fd2a57435034 /net | |
parent | db4148da2cc84c31419b5e3ae3115ac6e11817a1 (diff) |
netdev: use const for some name functions
dev_change_name and netdev_drivername should use const char on
parameters that are read-only input values. The strcpy to newname is
not needed since newname is not used later in function.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a90737fe2472..64f0d5b7cdfc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -890,7 +890,7 @@ int dev_alloc_name(struct net_device *dev, const char *name) | |||
890 | * Change name of a device, can pass format strings "eth%d". | 890 | * Change name of a device, can pass format strings "eth%d". |
891 | * for wildcarding. | 891 | * for wildcarding. |
892 | */ | 892 | */ |
893 | int dev_change_name(struct net_device *dev, char *newname) | 893 | int dev_change_name(struct net_device *dev, const char *newname) |
894 | { | 894 | { |
895 | char oldname[IFNAMSIZ]; | 895 | char oldname[IFNAMSIZ]; |
896 | int err = 0; | 896 | int err = 0; |
@@ -916,7 +916,6 @@ int dev_change_name(struct net_device *dev, char *newname) | |||
916 | err = dev_alloc_name(dev, newname); | 916 | err = dev_alloc_name(dev, newname); |
917 | if (err < 0) | 917 | if (err < 0) |
918 | return err; | 918 | return err; |
919 | strcpy(newname, dev->name); | ||
920 | } | 919 | } |
921 | else if (__dev_get_by_name(net, newname)) | 920 | else if (__dev_get_by_name(net, newname)) |
922 | return -EEXIST; | 921 | return -EEXIST; |
@@ -4754,10 +4753,10 @@ err_name: | |||
4754 | return -ENOMEM; | 4753 | return -ENOMEM; |
4755 | } | 4754 | } |
4756 | 4755 | ||
4757 | char *netdev_drivername(struct net_device *dev, char *buffer, int len) | 4756 | char *netdev_drivername(const struct net_device *dev, char *buffer, int len) |
4758 | { | 4757 | { |
4759 | struct device_driver *driver; | 4758 | const struct device_driver *driver; |
4760 | struct device *parent; | 4759 | const struct device *parent; |
4761 | 4760 | ||
4762 | if (len <= 0 || !buffer) | 4761 | if (len <= 0 || !buffer) |
4763 | return buffer; | 4762 | return buffer; |