From: Chris Rorvick Date: Wed, 5 Nov 2014 01:18:47 +0000 (-0600) Subject: fusbh200: Remove superfluous macro definitions X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d67bba78b308f7753dc5b4d5801f67817967b736;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git fusbh200: Remove superfluous macro definitions The fusbh200_dbg_port struct is a copy of the ehci_dbg_port definition in the header. Embedded in this definition are a number of macros which came along for the ride. These macros are not used in the fusbh200 driver and will conflict those in the new header. Signed-off-by: Chris Rorvick Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/fusbh200.h b/drivers/usb/host/fusbh200.h index 6e7b8c1cb877..da7152bcf9a8 100644 --- a/drivers/usb/host/fusbh200.h +++ b/drivers/usb/host/fusbh200.h @@ -290,24 +290,10 @@ struct fusbh200_regs { */ struct fusbh200_dbg_port { u32 control; -#define DBGP_OWNER (1<<30) -#define DBGP_ENABLED (1<<28) -#define DBGP_DONE (1<<16) -#define DBGP_INUSE (1<<10) -#define DBGP_ERRCODE(x) (((x)>>7)&0x07) -# define DBGP_ERR_BAD 1 -# define DBGP_ERR_SIGNAL 2 -#define DBGP_ERROR (1<<6) -#define DBGP_GO (1<<5) -#define DBGP_OUT (1<<4) -#define DBGP_LEN(x) (((x)>>0)&0x0f) u32 pids; -#define DBGP_PID_GET(x) (((x)>>16)&0xff) -#define DBGP_PID_SET(data, tok) (((data)<<8)|(tok)) u32 data03; u32 data47; u32 address; -#define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep)) }; #ifdef CONFIG_EARLY_PRINTK_DBGP