From: Jeff Garzik <jgarzik@mandrakesoft.com>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: tim@cyberelk.net, Linux-Kernel list <linux-kernel@vger.kernel.org>
Subject: PATCH 2.5.2.6: fix lp, ppdev builds
Date: Tue, 01 Jan 2002 20:21:50 -0500 [thread overview]
Message-ID: <3C3260AE.8514DF5A@mandrakesoft.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: lp-2.5.2.6.patch --]
[-- Type: text/plain, Size: 3576 bytes --]
? drivers/char/conmakehash
? drivers/char/consolemap_deftbl.c
Index: drivers/char/lp.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_5/drivers/char/lp.c,v
retrieving revision 1.2
diff -u -r1.2 lp.c
--- drivers/char/lp.c 2001/11/30 01:10:57 1.2
+++ drivers/char/lp.c 2002/01/02 01:15:40
@@ -294,7 +294,7 @@
static ssize_t lp_write(struct file * file, const char * buf,
size_t count, loff_t *ppos)
{
- unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = minor(file->f_dentry->d_inode->i_rdev);
struct parport *port = lp_table[minor].dev->port;
char *kbuf = lp_table[minor].lp_buffer;
ssize_t retv = 0;
@@ -403,7 +403,7 @@
static ssize_t lp_read(struct file * file, char * buf,
size_t count, loff_t *ppos)
{
- unsigned int minor=MINOR(file->f_dentry->d_inode->i_rdev);
+ unsigned int minor=minor(file->f_dentry->d_inode->i_rdev);
struct parport *port = lp_table[minor].dev->port;
ssize_t retval = 0;
char *kbuf = lp_table[minor].lp_buffer;
@@ -430,7 +430,7 @@
static int lp_open(struct inode * inode, struct file * file)
{
- unsigned int minor = MINOR(inode->i_rdev);
+ unsigned int minor = minor(inode->i_rdev);
if (minor >= LP_NO)
return -ENXIO;
@@ -488,7 +488,7 @@
static int lp_release(struct inode * inode, struct file * file)
{
- unsigned int minor = MINOR(inode->i_rdev);
+ unsigned int minor = minor(inode->i_rdev);
lp_claim_parport_or_block (&lp_table[minor]);
parport_negotiate (lp_table[minor].dev->port, IEEE1284_MODE_COMPAT);
@@ -503,7 +503,7 @@
static int lp_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned int minor = MINOR(inode->i_rdev);
+ unsigned int minor = minor(inode->i_rdev);
int status;
int retval = 0;
Index: drivers/char/ppdev.c
===================================================================
RCS file: /cvsroot/gkernel/linux_2_5/drivers/char/ppdev.c,v
retrieving revision 1.2
diff -u -r1.2 ppdev.c
--- drivers/char/ppdev.c 2001/11/30 01:10:57 1.2
+++ drivers/char/ppdev.c 2002/01/02 01:15:40
@@ -103,7 +103,7 @@
static ssize_t pp_read (struct file * file, char * buf, size_t count,
loff_t * ppos)
{
- unsigned int minor = MINOR (file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = minor (file->f_dentry->d_inode->i_rdev);
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_read = 0;
@@ -183,7 +183,7 @@
static ssize_t pp_write (struct file * file, const char * buf, size_t count,
loff_t * ppos)
{
- unsigned int minor = MINOR (file->f_dentry->d_inode->i_rdev);
+ unsigned int minor = minor (file->f_dentry->d_inode->i_rdev);
struct pp_struct *pp = file->private_data;
char * kbuffer;
ssize_t bytes_written = 0;
@@ -315,7 +315,7 @@
static int pp_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned int minor = MINOR(inode->i_rdev);
+ unsigned int minor = minor(inode->i_rdev);
struct pp_struct *pp = file->private_data;
struct parport * port;
@@ -613,7 +613,7 @@
static int pp_open (struct inode * inode, struct file * file)
{
- unsigned int minor = MINOR (inode->i_rdev);
+ unsigned int minor = minor (inode->i_rdev);
struct pp_struct *pp;
if (minor >= PARPORT_MAX)
@@ -642,7 +642,7 @@
static int pp_release (struct inode * inode, struct file * file)
{
- unsigned int minor = MINOR (inode->i_rdev);
+ unsigned int minor = minor (inode->i_rdev);
struct pp_struct *pp = file->private_data;
int compat_negot;
reply other threads:[~2002-01-02 1:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=3C3260AE.8514DF5A@mandrakesoft.com \
--to=jgarzik@mandrakesoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tim@cyberelk.net \
--cc=torvalds@transmeta.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 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.