From: Stefan Hajnoczi <stefanha@gmail.com>
To: devel@driverdev.osuosl.org
Cc: Markus Grabner <grabner@icg.tugraz.at>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
line6linux-devel@lists.sourceforge.net,
<linux-kernel@vger.kernel.org>,
laurent_navet@yahoo.com, Stefan Hajnoczi <stefanha@gmail.com>
Subject: [PATCH 37/46] staging: line6: drop variax raw sysfs attrs
Date: Thu, 22 Nov 2012 20:49:16 +0100 [thread overview]
Message-ID: <1353613765-18690-38-git-send-email-stefanha@gmail.com> (raw)
In-Reply-To: <1353613765-18690-1-git-send-email-stefanha@gmail.com>
Note that VARIAX_SYSEX_ACTIVATE was never used so drop it along with the
other VARIAX_SYSEX_* constants which are now unused.
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
---
drivers/staging/line6/variax.c | 73 ------------------------------------------
1 file changed, 73 deletions(-)
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index 4db21a3..ff55ad37 100644
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -16,9 +16,6 @@
#include "driver.h"
#include "variax.h"
-#define VARIAX_SYSEX_CODE 7
-#define VARIAX_SYSEX_PARAM 0x3b
-#define VARIAX_SYSEX_ACTIVATE 0x2a
#define VARIAX_MODEL_HEADER_LENGTH 7
#define VARIAX_MODEL_MESSAGE_LENGTH 199
#define VARIAX_OFFSET_ACTIVATE 7
@@ -70,7 +67,6 @@ static const char variax_request_model2[] = {
};
/* forward declarations: */
-static int variax_create_files2(struct device *dev);
static void variax_startup2(unsigned long data);
static void variax_startup4(unsigned long data);
static void variax_startup5(unsigned long data);
@@ -187,7 +183,6 @@ static void variax_startup7(struct work_struct *work)
/* device files: */
line6_variax_create_files(0, 0, line6->ifcdev);
- variax_create_files2(line6->ifcdev);
}
/*
@@ -270,58 +265,6 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
}
}
-#ifdef CONFIG_LINE6_USB_RAW
-
-static char *variax_alloc_sysex_buffer(struct usb_line6_variax *variax,
- int code, int size)
-{
- return line6_alloc_sysex_buffer(&variax->line6, VARIAX_SYSEX_CODE, code,
- size);
-}
-
-/*
- "write" request on "raw" special file.
-*/
-static ssize_t variax_set_raw2(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- struct usb_line6_variax *variax =
- usb_get_intfdata(to_usb_interface(dev));
- int size;
- int i;
- char *sysex;
-
- count -= count % 3;
- size = count * 2;
- sysex = variax_alloc_sysex_buffer(variax, VARIAX_SYSEX_PARAM, size);
-
- if (!sysex)
- return 0;
-
- for (i = 0; i < count; i += 3) {
- const unsigned char *p1 = buf + i;
- char *p2 = sysex + SYSEX_DATA_OFS + i * 2;
- p2[0] = p1[2] & 0x0f;
- p2[1] = p1[2] >> 4;
- p2[2] = p1[1] & 0x0f;
- p2[3] = p1[1] >> 4;
- p2[4] = p1[0] & 0x0f;
- p2[5] = p1[0] >> 4;
- }
-
- line6_send_sysex_message(&variax->line6, sysex, size);
- kfree(sysex);
- return count;
-}
-
-#endif
-
-#ifdef CONFIG_LINE6_USB_RAW
-static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);
-static DEVICE_ATTR(raw2, S_IWUSR, line6_nop_read, variax_set_raw2);
-#endif
-
/*
Variax destructor.
*/
@@ -346,18 +289,6 @@ static void variax_destruct(struct usb_interface *interface)
}
/*
- Create sysfs entries.
-*/
-static int variax_create_files2(struct device *dev)
-{
-#ifdef CONFIG_LINE6_USB_RAW
- CHECK_RETURN(device_create_file(dev, &dev_attr_raw));
- CHECK_RETURN(device_create_file(dev, &dev_attr_raw2));
-#endif
- return 0;
-}
-
-/*
Try to init workbench device.
*/
static int variax_try_init(struct usb_interface *interface,
@@ -448,10 +379,6 @@ void line6_variax_disconnect(struct usb_interface *interface)
if (dev != NULL) {
/* remove sysfs entries: */
line6_variax_remove_files(0, 0, dev);
-#ifdef CONFIG_LINE6_USB_RAW
- device_remove_file(dev, &dev_attr_raw);
- device_remove_file(dev, &dev_attr_raw2);
-#endif
}
variax_destruct(interface);
--
1.8.0
next prev parent reply other threads:[~2012-11-22 19:58 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 19:48 [PATCH 00/46] staging: line6: drop MIDI state sysfs attrs Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 01/46] staging: line6: drop channel sysfs attr Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 02/46] staging: line6: drop clip " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 03/46] staging: line6: drop unused param_dirty bitmap Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 04/46] staging: line6: drop dirty sysfs attr Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 05/46] staging: line6: drop dump " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 06/46] staging: line6: drop dump_buf " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 07/46] staging: line6: drop monitor_level " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 08/46] staging: line6: change monitor_level type ValueWait -> int Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 09/46] staging: line6: drop name sysfs attr Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 10/46] staging: line6: drop name_buf " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 11/46] staging: line6: drop retrieve_amp_setup " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 12/46] staging: line6: drop retrieve_channel " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 13/46] staging: line6: drop retrieve_effects_setup " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 14/46] staging: line6: drop store_amp_setup " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 15/46] staging: line6: drop store_channel " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 16/46] staging: line6: drop store_effects_setup " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 17/46] staging: line6: drop routing " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 18/46] staging: line6: drop tuner_freq " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 19/46] staging: line6: drop tuner_note " Stefan Hajnoczi
2012-11-22 19:48 ` [PATCH 20/46] staging: line6: drop tuner_mute " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 21/46] staging: line6: drop tuner_pitch " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 22/46] staging: line6: drop finish " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 23/46] staging: line6: drop midi_postprocess " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 24/46] staging: line6: drop midi_mask_receive Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 25/46] staging: line6: drop midi_mask_transmit Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 26/46] staging: line6: drop midi_postprocess flag Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 27/46] staging: line6: drop pod.c raw sysfs attr Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 28/46] staging: line6: drop tuner param filtering Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 29/46] staging: line6: drop variax model sysfs attr Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 30/46] staging: line6: drop variax volume " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 31/46] staging: line6: drop variax tone " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 32/46] staging: line6: drop variax name " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 33/46] staging: line6: drop variax bank " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 34/46] staging: line6: drop variax dump " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 35/46] staging: line6: drop variax active " Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 36/46] staging: line6: drop variax guitar " Stefan Hajnoczi
2012-11-22 19:49 ` Stefan Hajnoczi [this message]
2012-11-22 19:49 ` [PATCH 38/46] staging: line6: drop CONFIG_LINE6_USB_RAW Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 39/46] staging: line6: drop amp/effects dump request triggers Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 40/46] staging: line6: drop MIDI parameter sysfs attrs Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 41/46] staging: line6: drop pod prog_data buffers Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 42/46] staging: line6: drop unused pod atomic_flags field Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 43/46] staging: line6: drop variax model_data field Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 44/46] staging: line6: drop dump requests from variax startup Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 45/46] staging: line6: drop dump requests from pod startup Stefan Hajnoczi
2012-11-22 19:49 ` [PATCH 46/46] staging: line6: drop unused dumprequest code Stefan Hajnoczi
2012-11-22 19:58 ` [PATCH 00/46] staging: line6: drop MIDI state sysfs attrs Greg Kroah-Hartman
2012-11-22 20:08 ` Stefan Hajnoczi
2012-11-24 0:13 ` Markus Grabner
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=1353613765-18690-38-git-send-email-stefanha@gmail.com \
--to=stefanha@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=grabner@icg.tugraz.at \
--cc=gregkh@linuxfoundation.org \
--cc=laurent_navet@yahoo.com \
--cc=line6linux-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.