public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Maulik Mankad <x0082077@ti.com>,
	Sergei Shtylyov <sshtylyov@ru.mvista.com>,
	Greg Kroah-Hartman <gregkh@suse.de>,
	Ajay Kumar Gupta <ajay.gupta@ti.com>,
	Olof Johansson <olof@lixom.net>,
	Felipe Balbi <felipe.balbi@nokia.com>,
	linux-omap@vger.kernel.org
Subject: [PATCH 01/11] USB: Add empty functions in otg.h
Date: Fri, 19 Feb 2010 15:30:03 -0800	[thread overview]
Message-ID: <20100219233003.10559.36613.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100219232648.10559.380.stgit@baageli.muru.com>

From: Maulik Mankad <x0082077@ti.com>

Add empty functions for usb_nop_xceiv_register()
and usb_nop_xceiv_unregister() in otg.h so that
these functions can be called even when
CONFIG_NOP_USB_XCEIV is not enabled.

It allows to remove ifdef's from board file.

Signed-off-by: Maulik Mankad <x0082077@ti.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 include/linux/usb/otg.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 52bb917..fef0972 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -110,9 +110,19 @@ struct otg_transceiver {
 /* for board-specific init logic */
 extern int otg_set_transceiver(struct otg_transceiver *);
 
+#if defined(CONFIG_NOP_USB_XCEIV) || defined(CONFIG_NOP_USB_XCEIV_MODULE)
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);
+#else
+static inline void usb_nop_xceiv_register(void)
+{
+}
+
+static inline void usb_nop_xceiv_unregister(void)
+{
+}
+#endif
 
 /* helpers for direct access thru low-level io interface */
 static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)


  reply	other threads:[~2010-02-19 23:29 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-19 23:29 [PATCH 00/11] omap updates for 2.6.34, part 4 Tony Lindgren
2010-02-19 23:30 ` Tony Lindgren [this message]
2010-02-19 23:30 ` [PATCH 02/11] omap: musb: Remove #ifdef from board-omap3evm.c Tony Lindgren
     [not found] ` <20100219232648.10559.380.stgit-XB442sTQ5VIxQTnqJstS8Q@public.gmane.org>
2010-02-19 23:30   ` [PATCH 03/11] arm: omap: musb: ioremap only what's ours Tony Lindgren
2010-02-19 23:37     ` Aguirre, Sergio
2010-02-19 23:44       ` Tony Lindgren
2010-02-19 23:55         ` Aguirre, Sergio
2010-02-20  0:10           ` Tony Lindgren
2010-02-19 23:30   ` [PATCH 07/11] omap: musb: remove unused soft_con field Tony Lindgren
2010-02-19 23:30   ` [PATCH 08/11] omap: musb: remove unused dma data Tony Lindgren
2010-02-19 23:30 ` [PATCH 04/11] omap: musb: Pass board specific data from board file Tony Lindgren
2010-02-19 23:30 ` [PATCH 05/11] omap: musb: remove unused data Tony Lindgren
2010-02-19 23:30 ` [PATCH 06/11] arm: omap: musb: we can use clk framework Tony Lindgren
2010-02-19 23:30 ` [PATCH 09/11] omap: musb: remove unnecessary return Tony Lindgren
2010-02-19 23:30 ` [PATCH 10/11] omap: musb: get rid of dyn_fifo Tony Lindgren
2010-02-23  9:02   ` Gupta, Ajay Kumar
2010-02-23 14:55   ` Thomas Weber
2010-02-23 15:09     ` Andreas Hartmetz
2010-02-23 15:20       ` Gadiyar, Anand
2010-02-23 18:58         ` Tony Lindgren
2010-02-19 23:30 ` [PATCH 11/11] omap: musb: Add USB support to 4430 SDP board file Tony Lindgren
2010-02-20  8:30 ` [PATCH 00/11] omap updates for 2.6.34, part 4 Shilimkar, Santosh
2010-02-22 21:37   ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100219233003.10559.36613.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --cc=ajay.gupta@ti.com \
    --cc=felipe.balbi@nokia.com \
    --cc=gregkh@suse.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sshtylyov@ru.mvista.com \
    --cc=x0082077@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox