staging: gdm724x: Modified function name conflict set_endian

Conflict resolution for function name set_endian when building for powerpc
The name changed to gdm_set_endian

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Won Kang <wonkang@gctsemi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gdm724x/gdm_endian.c b/drivers/staging/gdm724x/gdm_endian.c
index 02934093ce7f6595490ef378e0f7ba01dfbd7ffa..f6cc90ae9ba6980f0ff0c4046eb9144ec4340889 100644 (file)
--- a/drivers/staging/gdm724x/gdm_endian.c
+++ b/drivers/staging/gdm724x/gdm_endian.c
@@ -14,7 +14,7 @@
 #include <linux/slab.h>
 #include "gdm_endian.h"
 
-void set_endian(struct gdm_endian *ed, u8 dev_endian)
+void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian)
 {
        u8 a[2] = {0x12, 0x34};
        u8 b[2] = {0, };

diff --git a/drivers/staging/gdm724x/gdm_endian.h b/drivers/staging/gdm724x/gdm_endian.h
index 775794db6ab69a2483ff49fedf44dd251c80c370..9b2531ff908e2f11faba8db0c81adeace9dbaccc 100644 (file)
--- a/drivers/staging/gdm724x/gdm_endian.h
+++ b/drivers/staging/gdm724x/gdm_endian.h
@@ -40,7 +40,7 @@ struct gdm_endian {
        u8 host_ed;
 };
 
-void set_endian(struct gdm_endian *ed, u8 dev_endian);
+void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian);
 u16 gdm_cpu_to_dev16(struct gdm_endian *ed, u16 x);
 u16 gdm_dev16_to_cpu(struct gdm_endian *ed, u16 x);
 u32 gdm_cpu_to_dev32(struct gdm_endian *ed, u32 x);

diff --git a/drivers/staging/gdm724x/gdm_usb.c b/drivers/staging/gdm724x/gdm_usb.c
index 4b10f23845ad0830ec1c367700eeb403e38fbf01..bdc96370e4306a325e15c80d17b32becfef71bd8 100644 (file)
--- a/drivers/staging/gdm724x/gdm_usb.c
+++ b/drivers/staging/gdm724x/gdm_usb.c
@@ -870,9 +870,9 @@ static int gdm_usb_probe(struct usb_interface *intf, const struct usb_device_id
 
        /* List up hosts with big endians, otherwise, defaults to little endian */
        if (idProduct == PID_GDM7243)
-               set_endian(&udev->gdm_ed, ENDIANNESS_BIG);
+               gdm_set_endian(&udev->gdm_ed, ENDIANNESS_BIG);
        else
-               set_endian(&udev->gdm_ed, ENDIANNESS_LITTLE);
+               gdm_set_endian(&udev->gdm_ed, ENDIANNESS_LITTLE);
 
        ret = request_mac_address(udev);
        if (ret < 0) {