From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Buesch Subject: [PATCH] cbus: Removed unused ioctl interface header Date: Sun, 06 Mar 2011 16:17:16 +0100 Message-ID: <1299424636.1292.2.camel@marge> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from 80-190-117-144.ip-home.de ([80.190.117.144]:59246 "EHLO bu3sch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186Ab1CFPRW (ORCPT ); Sun, 6 Mar 2011 10:17:22 -0500 Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Tony Lindgren Cc: Felipe Balbi , linux-omap The deprecated ioctl interface was removed. Also remove the header. Signed-off-by: Michael Buesch --- Index: linux-omap-2.6/drivers/cbus/user_retu_tahvo.h =================================================================== --- linux-omap-2.6.orig/drivers/cbus/user_retu_tahvo.h 2011-03-06 16:14:56.248545711 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/** - * drivers/cbus/user_retu_tahvo.h - * - * Copyright (C) 2004, 2005 Nokia Corporation - * - * Written by Mikko Ylinen - * - * Definitions and types used by both retu-user and tahvo-user. - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file "COPYING" in the main directory of this - * archive for more details. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _USER_RETU_TAHVO_H -#define _USER_RETU_TAHVO_H - -/* Chip IDs */ -#define CHIP_RETU 1 -#define CHIP_TAHVO 2 - -/* Register access type bits */ -#define READ_ONLY 1 -#define WRITE_ONLY 2 -#define READ_WRITE 3 -#define TOGGLE 4 - -#define MASK(field) ((u16)(field & 0xFFFF)) -#define REG(field) ((u16)((field >> 16) & 0x3F)) - -/*** IOCTL definitions. These should be kept in sync with user space **********/ - -#define URT_IOC_MAGIC '`' - -/* - * IOCTL function naming conventions: - * ================================== - * 0 -- No argument and return value - * S -- Set through a pointer - * T -- Tell directly with the argument value - * G -- Reply by setting through a pointer - * Q -- response is on the return value - * X -- S and G atomically - * H -- T and Q atomically - */ - -/* General */ -#define URT_IOCT_IRQ_SUBSCR _IO(URT_IOC_MAGIC, 0) - -/* RETU */ -#define RETU_IOCH_READ _IO(URT_IOC_MAGIC, 1) -#define RETU_IOCX_WRITE _IO(URT_IOC_MAGIC, 2) -#define RETU_IOCH_ADC_READ _IO(URT_IOC_MAGIC, 3) - -/* TAHVO */ -#define TAHVO_IOCH_READ _IO(URT_IOC_MAGIC, 4) -#define TAHVO_IOCX_WRITE _IO(URT_IOC_MAGIC, 5) - -/* This structure is used for writing RETU/TAHVO registers */ -struct retu_tahvo_write_parms { - u32 field; - u16 value; - u8 result; -}; - -#endif -- Greetings, Michael.