Commit 9c02d0db authored by Won Kang's avatar Won Kang Committed by Greg Kroah-Hartman
Browse files

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: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarWon Kang <wonkang@gctsemi.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a66b0f03

drivers/staging/gdm724x/gdm_endian.c

+1 −1
Original line number Diff line number Diff line
@@ -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, };

drivers/staging/gdm724x/gdm_endian.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/gdm724x/gdm_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {