From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754512Ab2DXLgB (ORCPT ); Tue, 24 Apr 2012 07:36:01 -0400 Received: from eu1sys200aog106.obsmtp.com ([207.126.144.121]:55521 "EHLO eu1sys200aog106.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753992Ab2DXLeg (ORCPT ); Tue, 24 Apr 2012 07:34:36 -0400 From: Viresh Kumar To: Cc: , , , , , , , , Viresh Kumar , Greg Kroah-Hartman , Subject: [PATCH V3 05/12] usb/musb: Remove conditional compilation of clk code Date: Tue, 24 Apr 2012 16:51:27 +0530 Message-ID: <40288f19ddb96cef37285dd0fa79a48a7e381fb3.1335266056.git.viresh.kumar@st.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Viresh Kumar With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h, there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif macros. musb also has these dummy macros defined locally. Remove them as they aren't required anymore. Signed-off-by: Viresh Kumar Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org --- drivers/usb/musb/musb_core.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 93de517..371a3a5 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h @@ -81,14 +81,6 @@ struct musb_ep; #define is_peripheral_active(m) (!(m)->is_host) #define is_host_active(m) ((m)->is_host) -#ifndef CONFIG_HAVE_CLK -/* Dummy stub for clk framework */ -#define clk_get(dev, id) NULL -#define clk_put(clock) do {} while (0) -#define clk_enable(clock) do {} while (0) -#define clk_disable(clock) do {} while (0) -#endif - #ifdef CONFIG_PROC_FS #include #define MUSB_CONFIG_PROC_FS -- 1.7.9