History

Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging and IIO updates from Greg KH: "Here is the big staging/iio driver patches for 5.6-rc1 Included in here are: - lots of new IIO drivers and updates for that subsystem - the usual huge quantity of minor cleanups for staging drivers - removal of the following staging drivers: - isdn/avm - isdn/gigaset - isdn/hysdn - octeon-usb - octeon ethernet Overall we deleted far more lines than we added, removing over 40k of old and obsolete driver code. All of these changes have been in linux-next for a while with no reported issues" * tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (353 commits) staging: most: usb: check for NULL device staging: next: configfs: fix release link staging: most: core: fix logging messages staging: most: core: remove container struct staging: most: remove struct device core driver staging: most: core: drop device reference staging: most: remove device from interface structure staging: comedi: drivers: fix spelling mistake "to" -> "too" staging: exfat: remove fs_func struct. staging: wilc1000: avoid mutex unlock without lock in wilc_wlan_handle_txq() staging: wilc1000: return zero on success and non-zero on function failure staging: axis-fifo: replace spinlock with mutex staging: wilc1000: remove unused code prior to throughput enhancement in SPI staging: wilc1000: added 'wilc_' prefix for 'struct assoc_resp' name staging: wilc1000: move firmware API struct's to separate header file staging: wilc1000: remove use of infinite loop conditions staging: kpc2000: rename variables with kpc namespace staging: vt6656: Remove memory buffer from vnt_download_firmware. staging: vt6656: Just check NEWRSR_DECRYPTOK for RX_FLAG_DECRYPTED. staging: vt6656: Use vnt_rx_tail struct for tail variables. ...

Linus Torvalds committed 6 years ago

Commit 7ba31c32 parents ca9b5b6 fc15799351 files · +7825 −40990Browse files

Showing the changes to include/uapi/linux (3 of 351 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/b1lli.h +0 −74
  2. include/uapi/linux/gigaset_dev.h +0 −39
  3. include/uapi/linux/hysdn_if.h +0 −34
include/uapi/linux/b1lli.h+0−74
@@ -1,74 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $
3− *
4− * ISDN lowlevel-module for AVM B1-card.
5− *
6− * Copyright 1996 by Carsten Paeth (calle@calle.in-berlin.de)
7− *
8− * This software may be used and distributed according to the terms
9− * of the GNU General Public License, incorporated herein by reference.
10− *
11− */
12−
13−#ifndef _B1LLI_H_
14−#define _B1LLI_H_
15−/*
16− * struct for loading t4 file
17− */
18−typedef struct avmb1_t4file {
19− int len;
20− unsigned char *data;
21−} avmb1_t4file;
22−
23−typedef struct avmb1_loaddef {
24− int contr;
25− avmb1_t4file t4file;
26−} avmb1_loaddef;
27−
28−typedef struct avmb1_loadandconfigdef {
29− int contr;
30− avmb1_t4file t4file;
31− avmb1_t4file t4config;
32−} avmb1_loadandconfigdef;
33−
34−typedef struct avmb1_resetdef {
35− int contr;
36−} avmb1_resetdef;
37−
38−typedef struct avmb1_getdef {
39− int contr;
40− int cardtype;
41− int cardstate;
42−} avmb1_getdef;
43−
44−/*
45− * struct for adding new cards
46− */
47−typedef struct avmb1_carddef {
48− int port;
49− int irq;
50−} avmb1_carddef;
51−
52−#define AVM_CARDTYPE_B1 0
53−#define AVM_CARDTYPE_T1 1
54−#define AVM_CARDTYPE_M1 2
55−#define AVM_CARDTYPE_M2 3
56−
57−typedef struct avmb1_extcarddef {
58− int port;
59− int irq;
60− int cardtype;
61− int cardnr; /* for HEMA/T1 */
62−} avmb1_extcarddef;
63−
64−#define AVMB1_LOAD 0 /* load image to card */
65−#define AVMB1_ADDCARD 1 /* add a new card - OBSOLETE */
66−#define AVMB1_RESETCARD 2 /* reset a card */
67−#define AVMB1_LOAD_AND_CONFIG 3 /* load image and config to card */
68−#define AVMB1_ADDCARD_WITH_TYPE 4 /* add a new card, with cardtype */
69−#define AVMB1_GET_CARDINFO 5 /* get cardtype */
70−#define AVMB1_REMOVECARD 6 /* remove a card - OBSOLETE */
71−
72−#define AVMB1_REGISTERCARD_IS_OBSOLETE
73−
74−#endif /* _B1LLI_H_ */
include/uapi/linux/gigaset_dev.h+0−39
@@ -1,39 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
2−/*
3− * interface to user space for the gigaset driver
4− *
5− * Copyright (c) 2004 by Hansjoerg Lipp <hjlipp@web.de>
6− *
7− * =====================================================================
8− * This program is free software; you can redistribute it and/or
9− * modify it under the terms of the GNU General Public License as
10− * published by the Free Software Foundation; either version 2 of
11− * the License, or (at your option) any later version.
12− * =====================================================================
13− */
14−
15−#ifndef GIGASET_INTERFACE_H
16−#define GIGASET_INTERFACE_H
17−
18−#include <linux/ioctl.h>
19−
20−/* The magic IOCTL value for this interface. */
21−#define GIGASET_IOCTL 0x47
22−
23−/* enable/disable device control via character device (lock out ISDN subsys) */
24−#define GIGASET_REDIR _IOWR(GIGASET_IOCTL, 0, int)
25−
26−/* enable adapter configuration mode (M10x only) */
27−#define GIGASET_CONFIG _IOWR(GIGASET_IOCTL, 1, int)
28−
29−/* set break characters (M105 only) */
30−#define GIGASET_BRKCHARS _IOW(GIGASET_IOCTL, 2, unsigned char[6])
31−
32−/* get version information selected by arg[0] */
33−#define GIGASET_VERSION _IOWR(GIGASET_IOCTL, 3, unsigned[4])
34−/* values for GIGASET_VERSION arg[0] */
35−#define GIGVER_DRIVER 0 /* get driver version */
36−#define GIGVER_COMPAT 1 /* get interface compatibility version */
37−#define GIGVER_FWBASE 2 /* get base station firmware version */
38−
39−#endif
include/uapi/linux/hysdn_if.h+0−34
@@ -1,34 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−/* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $
3− *
4− * Linux driver for HYSDN cards
5− * ioctl definitions shared by hynetmgr and driver.
6− *
7− * Author Werner Cornelius (werner@titro.de) for Hypercope GmbH
8− * Copyright 1999 by Werner Cornelius (werner@titro.de)
9− *
10− * This software may be used and distributed according to the terms
11− * of the GNU General Public License, incorporated herein by reference.
12− *
13− */
14−
15−/****************/
16−/* error values */
17−/****************/
18−#define ERR_NONE 0 /* no error occurred */
19−#define ERR_ALREADY_BOOT 1000 /* we are already booting */
20−#define EPOF_BAD_MAGIC 1001 /* bad magic in POF header */
21−#define ERR_BOARD_DPRAM 1002 /* board DPRAM failed */
22−#define EPOF_INTERNAL 1003 /* internal POF handler error */
23−#define EPOF_BAD_IMG_SIZE 1004 /* POF boot image size invalid */
24−#define ERR_BOOTIMG_FAIL 1005 /* 1. stage boot image did not start */
25−#define ERR_BOOTSEQ_FAIL 1006 /* 2. stage boot seq handshake timeout */
26−#define ERR_POF_TIMEOUT 1007 /* timeout waiting for card pof ready */
27−#define ERR_NOT_BOOTED 1008 /* operation only allowed when booted */
28−#define ERR_CONF_LONG 1009 /* conf line is too long */
29−#define ERR_INV_CHAN 1010 /* invalid channel number */
30−#define ERR_ASYNC_TIME 1011 /* timeout sending async data */
31−
32−
33−
34−

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t