From eb84709192f1b616cd141594c34ddbc072c8d6ec Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 25 Mar 2013 15:18:38 +0100 Subject: clk: remove unused __clk_[get|put] This is some unused code resulting from copying stuff from the kernel. Remove it. Signed-off-by: Sascha Hauer --- arch/arm/include/asm/clkdev.h | 17 ----------------- arch/arm/mach-at91/include/mach/clkdev.h | 7 ------- arch/arm/mach-bcm2835/include/mach/clkdev.h | 7 ------- arch/arm/mach-clps711x/include/mach/clkdev.h | 7 ------- arch/arm/mach-highbank/include/mach/clkdev.h | 7 ------- arch/arm/mach-imx/include/mach/clkdev.h | 7 ------- arch/arm/mach-nomadik/include/mach/clkdev.h | 7 ------- arch/arm/mach-versatile/include/mach/clkdev.h | 7 ------- arch/arm/mach-vexpress/include/mach/clkdev.h | 7 ------- drivers/clk/clkdev.c | 3 --- include/linux/clkdev.h | 2 -- 11 files changed, 78 deletions(-) delete mode 100644 arch/arm/include/asm/clkdev.h delete mode 100644 arch/arm/mach-at91/include/mach/clkdev.h delete mode 100644 arch/arm/mach-bcm2835/include/mach/clkdev.h delete mode 100644 arch/arm/mach-clps711x/include/mach/clkdev.h delete mode 100644 arch/arm/mach-highbank/include/mach/clkdev.h delete mode 100644 arch/arm/mach-imx/include/mach/clkdev.h delete mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h delete mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h delete mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h diff --git a/arch/arm/include/asm/clkdev.h b/arch/arm/include/asm/clkdev.h deleted file mode 100644 index ad33945880..0000000000 --- a/arch/arm/include/asm/clkdev.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * arch/arm/include/asm/clkdev.h - * - * Copyright (C) 2008 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Helper for the clk API to assist looking up a struct clk. - */ -#ifndef __ASM_CLKDEV_H -#define __ASM_CLKDEV_H - -#include - -#endif diff --git a/arch/arm/mach-at91/include/mach/clkdev.h b/arch/arm/mach-at91/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-at91/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-bcm2835/include/mach/clkdev.h b/arch/arm/mach-bcm2835/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-bcm2835/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-clps711x/include/mach/clkdev.h b/arch/arm/mach-clps711x/include/mach/clkdev.h deleted file mode 100644 index 9278209017..0000000000 --- a/arch/arm/mach-clps711x/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __MACH_CLKDEV_H -#define __MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-highbank/include/mach/clkdev.h b/arch/arm/mach-highbank/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-highbank/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-imx/include/mach/clkdev.h b/arch/arm/mach-imx/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-imx/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-nomadik/include/mach/clkdev.h b/arch/arm/mach-nomadik/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-nomadik/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-versatile/include/mach/clkdev.h b/arch/arm/mach-versatile/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-versatile/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/arch/arm/mach-vexpress/include/mach/clkdev.h b/arch/arm/mach-vexpress/include/mach/clkdev.h deleted file mode 100644 index 04b37a8980..0000000000 --- a/arch/arm/mach-vexpress/include/mach/clkdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 5441eeb8dc..338b9e8dfe 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -95,8 +95,6 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id) struct clk *clk; clk = clk_find(dev_id, con_id); - if (clk && !__clk_get(clk)) - clk = NULL; return clk ? clk : ERR_PTR(-ENOENT); } @@ -117,7 +115,6 @@ EXPORT_SYMBOL(clk_get); void clk_put(struct clk *clk) { - __clk_put(clk); } EXPORT_SYMBOL(clk_put); diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h index 1fc0ab9973..eeadcfefa7 100644 --- a/include/linux/clkdev.h +++ b/include/linux/clkdev.h @@ -12,8 +12,6 @@ #ifndef __CLKDEV_H #define __CLKDEV_H -#include - struct clk; struct device_d; -- cgit v1.2.3