From: Alexey Dobriyan <adobriyan@gmail.com>
To: muli@il.ibm.com, akpm@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] OSS trident: switch from ->write_proc
Date: Wed, 14 May 2008 01:05:44 +0400 [thread overview]
Message-ID: <20080513210544.GB23977@martell.zuzino.mipt.ru> (raw)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
sound/oss/trident.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -4028,10 +4028,10 @@ ali_free_other_states_resources(struct trident_state *state)
static struct proc_dir_entry *res;
-static int
-ali_write_proc(struct file *file, const char __user *buffer, unsigned long count, void *data)
+static ssize_t
+ali_write_proc(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
{
- struct trident_card *card = (struct trident_card *) data;
+ struct trident_card *card = PDE(file->f_path.dentry->d_inode)->data;
unsigned long flags;
char c;
@@ -4068,6 +4068,11 @@ ali_write_proc(struct file *file, const char __user *buffer, unsigned long count
return count;
}
+static const struct file_operations ali_proc_fops = {
+ .owner = THIS_MODULE,
+ .write = ali_write_proc,
+};
+
/* OSS /dev/mixer file operation methods */
static int
trident_open_mixdev(struct inode *inode, struct file *file)
@@ -4441,11 +4446,8 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id)
/* ALi SPDIF OUT function */
if (card->revision == ALI_5451_V02) {
ali_setup_spdif_out(card, ALI_PCM_TO_SPDIF_OUT);
- res = create_proc_entry("ALi5451", 0, NULL);
- if (res) {
- res->write_proc = ali_write_proc;
- res->data = card;
- }
+ proc_create_data("ALi5451", 0, NULL,
+ &ali_proc_fops, card);
}
/* Add H/W Volume Control By Matt Wu Jul. 06, 2001 */
next reply other threads:[~2008-05-13 20:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-13 21:05 Alexey Dobriyan [this message]
2008-05-14 5:47 ` [PATCH] OSS trident: switch from ->write_proc Muli Ben-Yehuda
2008-05-14 20:49 ` Alexey Dobriyan
2008-05-15 16:48 ` Muli Ben-Yehuda
2008-05-16 0:23 ` [RFC: 2.6 patch] remove the OSS trident driver Adrian Bunk
2008-05-18 6:45 ` Muli Ben-Yehuda
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=20080513210544.GB23977@martell.zuzino.mipt.ru \
--to=adobriyan@gmail.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=muli@il.ibm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).