lkml.org 
[lkml]   [2002]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectPatch: linux-2.5.2-pre8/drivers/ieee1394 kdev_t compilation fixes
	The following patch fixes the kdev_t compilation errors
in linux-2.5.2-pre8/drivers/ieee1394. It just a global replace
of "MINOR(" with "minor(". I only know that the new code compiles.
I have not tested it.

Also my drivers/ieee1394 is slightly different from the
stock kernel (some code cleanup), so you may get a few messages from
patch about it. However, I believe the areas relevant to this patch
are all the same.

--
Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."
--- linux/drivers/ieee1394/pcilynx.c 2001/11/15 02:58:40 1.17
+++ linux/drivers/ieee1394/pcilynx.c 2002/01/05 07:34:25
@@ -764,7 +764,7 @@

static int mem_open(struct inode *inode, struct file *file)
{
- int cid = MINOR(inode->i_rdev);
+ int cid = minor(inode->i_rdev);
enum { t_rom, t_aux, t_ram } type;
struct memdata *md;
struct hpsb_host *host = hpsb_find_host(&lynx_template, cid);
--- linux/drivers/ieee1394/raw1394.c 2001/11/29 02:39:38 1.1.1.16
+++ linux/drivers/ieee1394/raw1394.c 2002/01/05 07:34:25
@@ -915,7 +915,7 @@
{
struct file_info *fi;

- if (MINOR(inode->i_rdev)) {
+ if (minor(inode->i_rdev)) {
return -ENXIO;
}

--- linux/drivers/ieee1394/video1394.c 2002/01/01 00:02:21 1.11
+++ linux/drivers/ieee1394/video1394.c 2002/01/05 07:34:25
@@ -850,7 +850,7 @@
struct video_card *p;
list_for_each(lh, &video1394_cards) {
p = list_entry(lh, struct video_card, list);
- if (p->id == MINOR(inode->i_rdev)) {
+ if (p->id == minor(inode->i_rdev)) {
video = p;
break;
}
@@ -859,7 +859,7 @@
spin_unlock_irqrestore(&video1394_cards_lock, flags);

if (video == NULL) {
- PRINT_G(KERN_ERR, __FUNCTION__": Unknown video card for minor %d", MINOR(inode->i_rdev));
+ PRINT_G(KERN_ERR, __FUNCTION__": Unknown video card for minor %d", minor(inode->i_rdev));
return -EFAULT;
}

@@ -1328,7 +1328,7 @@
struct video_card *p;
list_for_each(lh, &video1394_cards) {
p = list_entry(lh, struct video_card, list);
- if (p->id == MINOR(file->f_dentry->d_inode->i_rdev)) {
+ if (p->id == minor(file->f_dentry->d_inode->i_rdev)) {
video = p;
break;
}
@@ -1338,7 +1338,7 @@

if (video == NULL) {
PRINT_G(KERN_ERR, __FUNCTION__": Unknown video card for minor %d",
- MINOR(file->f_dentry->d_inode->i_rdev));
+ minor(file->f_dentry->d_inode->i_rdev));
return -EFAULT;
}

@@ -1357,7 +1357,7 @@

static int video1394_open(struct inode *inode, struct file *file)
{
- int i = MINOR(inode->i_rdev);
+ int i = minor(inode->i_rdev);
unsigned long flags;
struct video_card *video = NULL;
struct list_head *lh;
@@ -1397,7 +1397,7 @@
struct video_card *p;
list_for_each(lh, &video1394_cards) {
p = list_entry(lh, struct video_card, list);
- if (p->id == MINOR(inode->i_rdev)) {
+ if (p->id == minor(inode->i_rdev)) {
video = p;
break;
}
@@ -1407,7 +1407,7 @@

if (video == NULL) {
PRINT_G(KERN_ERR, __FUNCTION__": Unknown device for minor %d",
- MINOR(inode->i_rdev));
+ minor(inode->i_rdev));
return 1;
}
\
 
 \ /
  Last update: 2005-03-22 13:15    [W:0.044 / U:4.588 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site