diff mbox

[PULL,00/27] target-arm queue

Message ID CAFEAcA9o=9S643uoL=cnsHjwoyJ09AKLM1Hce4E8wdtCkaScnQ@mail.gmail.com
State Not Applicable
Headers show

Commit Message

Peter Maydell Sept. 7, 2015, 9:40 a.m. UTC 
On 4 September 2015 at 16:05, Peter Maydell <peter.maydell@linaro.org> wrote:
> Another target-arm queue flush. I expect there'll be another
> lot next week...
>
>
> The following changes since commit b041066421e8dcc7d080dfcfd83551c9c9f24ade:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2015-09-03 16:17:28 +0100)
>
> are available in the git repository at:
>
>
>   git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20150904
>
> for you to fetch changes up to d9fd6f3874a326033a446a6db8cd113bf4015e6a:
>
>   arm/virt: Add full-sized CPU affinity handling (2015-09-04 15:49:54 +0100)
>
> ----------------------------------------------------------------
> target-arm queue:
>  * cleanup to use g_new() and friends
>  * support semihosting in A64
>  * add SMBIOS support to mach-virt
>  * remove hw_error() usages
>  * fix bug in the AArch32:AArch64 register mapping
>  * add a second PCI memory window in highmem on virt board
>  * fix bug in arm_excp_unmasked()
>  * add i.MX31 SoC
>  * remove restriction on handling affinity values in virt board

The clang build complains about an unused function in imx_i2c.c.
I'm going to squash in this fix to the offending patch and resend
the pullreq (cover letter).


thanks
-- PMM
diff mbox

Patch

diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c
index 2568837..8474872 100644
--- a/hw/i2c/imx_i2c.c
+++ b/hw/i2c/imx_i2c.c
@@ -65,11 +65,6 @@  static inline bool imx_i2c_is_master(IMXI2CState *s)
     return s->i2cr & I2CR_MSTA;
 }

-static inline bool imx_i2c_direction_is_tx(IMXI2CState *s)
-{
-    return s->i2cr & I2CR_MTX;
-}
-
 static void imx_i2c_reset(DeviceState *dev)
 {
     IMXI2CState *s = IMX_I2C(dev);