Merge http://lia64.bkbits.net/to-linus-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

38 files changed, 92 insertions, 92 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 75ccb087609f..fe654fd91508 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -42,7 +42,7 @@ static LIST_HEAD(snd_control_ioctls);
 
 static int snd_ctl_open(struct inode *inode, struct file *file)
 {
-	int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+	int cardnum = SNDRV_MINOR_CARD(iminor(inode));
 	unsigned long flags;
 	snd_card_t *card;
 	snd_ctl_file_t *ctl;
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 2da3e59258e7..f7191fc7c776 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -73,7 +73,7 @@ static ssize_t snd_hwdep_write(struct file * file, const char *buf, size_t count
 
 static int snd_hwdep_open(struct inode *inode, struct file * file)
 {
-	int major = major(inode->i_rdev);
+	int major = imajor(inode);
 	int cardnum;
 	int device;
 	snd_hwdep_t *hw;
@@ -82,12 +82,12 @@ static int snd_hwdep_open(struct inode *inode, struct file * file)
 
 	switch (major) {
 	case CONFIG_SND_MAJOR:
-		cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
-		device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) - SNDRV_MINOR_HWDEP;
+		cardnum = SNDRV_MINOR_CARD(iminor(inode));
+		device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_HWDEP;
 		break;
 #ifdef CONFIG_SND_OSSEMUL
 	case SOUND_MAJOR:
-		cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+		cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
 		device = 0;
 		break;
 #endif
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 6785cb930664..0becc2d85f40 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
 
 static int snd_mixer_oss_open(struct inode *inode, struct file *file)
 {
-	int cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+	int cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
 	snd_card_t *card;
 	snd_mixer_oss_file_t *fmixer;
 	int err;
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 50ffd13db2a8..e5272ee9527b 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -1681,7 +1681,7 @@ static int snd_pcm_oss_open_file(struct file *file,
 
 static int snd_pcm_oss_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	int cardnum = SNDRV_MINOR_OSS_CARD(minor);
 	int device;
 	int err;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index f82b4f5cfce0..bc2e16a4f6a3 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1431,11 +1431,11 @@ static struct file *snd_pcm_file_fd(int fd)
 		return 0;
 	inode = file->f_dentry->d_inode;
 	if (!S_ISCHR(inode->i_mode) ||
-	    major(inode->i_rdev) != snd_major) {
+	    imajor(inode) != snd_major) {
 		fput(file);
 		return 0;
 	}
-	minor = minor(inode->i_rdev);
+	minor = iminor(inode);
 	if (minor >= 256 || 
 	    minor % SNDRV_MINOR_DEVICES < SNDRV_MINOR_PCM_PLAYBACK) {
 		fput(file);
@@ -1940,8 +1940,8 @@ static int snd_pcm_open_file(struct file *file,
 
 int snd_pcm_open(struct inode *inode, struct file *file)
 {
-	int cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
-	int device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev));
+	int cardnum = SNDRV_MINOR_CARD(iminor(inode));
+	int device = SNDRV_MINOR_DEVICE(iminor(inode));
 	int err;
 	snd_pcm_t *pcm;
 	snd_pcm_file_t *pcm_file;
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 8be2292ad25e..480e96fc2ffc 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -345,7 +345,7 @@ int snd_rawmidi_kernel_open(int cardnum, int device, int subdevice,
 
 static int snd_rawmidi_open(struct inode *inode, struct file *file)
 {
-	int maj = major(inode->i_rdev);
+	int maj = imajor(inode);
 	int cardnum;
 	snd_card_t *card;
 	int device, subdevice;
@@ -359,16 +359,16 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
 
 	switch (maj) {
 	case CONFIG_SND_MAJOR:
-		cardnum = SNDRV_MINOR_CARD(minor(inode->i_rdev));
+		cardnum = SNDRV_MINOR_CARD(iminor(inode));
 		cardnum %= SNDRV_CARDS;
-		device = SNDRV_MINOR_DEVICE(minor(inode->i_rdev)) - SNDRV_MINOR_RAWMIDI;
+		device = SNDRV_MINOR_DEVICE(iminor(inode)) - SNDRV_MINOR_RAWMIDI;
 		device %= SNDRV_MINOR_RAWMIDIS;
 		break;
 #ifdef CONFIG_SND_OSSEMUL
 	case SOUND_MAJOR:
-		cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
+		cardnum = SNDRV_MINOR_OSS_CARD(iminor(inode));
 		cardnum %= SNDRV_CARDS;
-		device = SNDRV_MINOR_OSS_DEVICE(minor(inode->i_rdev)) == SNDRV_MINOR_OSS_MIDI ?
+		device = SNDRV_MINOR_OSS_DEVICE(iminor(inode)) == SNDRV_MINOR_OSS_MIDI ?
 			midi_map[cardnum] : amidi_map[cardnum];
 		break;
 #endif
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index 25a8ad617a22..b1aebe54ca50 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -121,7 +121,7 @@ odev_open(struct inode *inode, struct file *file)
 {
 	int level, rc;
 
-	if (minor(inode->i_rdev) == SNDRV_MINOR_OSS_MUSIC)
+	if (iminor(inode) == SNDRV_MINOR_OSS_MUSIC)
 		level = SNDRV_SEQ_OSS_MODE_MUSIC;
 	else
 		level = SNDRV_SEQ_OSS_MODE_SYNTH;
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 5d0c19889d78..3d8b50d9d04b 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -117,7 +117,7 @@ static snd_minor_t *snd_minor_search(int minor)
 
 static int snd_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	int card = SNDRV_MINOR_CARD(minor);
 	int dev = SNDRV_MINOR_DEVICE(minor);
 	snd_minor_t *mptr = NULL;
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index aaa5d731049f..6b4ab48945d7 100644
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -755,7 +755,7 @@ static int ad1889_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 static int ad1889_open(struct inode *inode, struct file *file)
 {
 	/* check minor; only support /dev/dsp atm */
-	if (minor(inode->i_rdev) != 3)
+	if (iminor(inode) != 3)
 		return -ENXIO;
 	
 	file->private_data = ad1889_dev;
@@ -788,7 +788,7 @@ static struct file_operations ad1889_fops = {
 /************************* /dev/mixer interfaces ************************ */
 static int ad1889_mixer_open(struct inode *inode, struct file *file)
 {
-	if (ad1889_dev->ac97_codec->dev_mixer != minor(inode->i_rdev))
+	if (ad1889_dev->ac97_codec->dev_mixer != iminor(inode))
 		return -ENODEV;
 
 	file->private_data = ad1889_dev->ac97_codec;
diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c
index 419097360ca2..7bb3d707d6c8 100644
--- a/sound/oss/ali5455.c
+++ b/sound/oss/ali5455.c
@@ -3026,7 +3026,7 @@ static void ali_ac97_set(struct ac97_codec *dev, u8 reg, u16 data)
 static int ali_open_mixdev(struct inode *inode, struct file *file)
 {
 	int i;
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct ali_card *card = devs;
 	for (card = devs; card != NULL; card = card->next) {
 		/*
diff --git a/sound/oss/au1000.c b/sound/oss/au1000.c
index d4ed031753ca..dc6f8aa74148 100644
--- a/sound/oss/au1000.c
+++ b/sound/oss/au1000.c
@@ -1842,7 +1842,7 @@ static int au1000_ioctl(struct inode *inode, struct file *file,
 
 static int  au1000_open(struct inode *inode, struct file *file)
 {
-	int             minor = MINOR(inode->i_rdev);
+	int             minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	struct au1000_state *s = &au1000_state;
 	int             ret;
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index 73d0b271279c..0d516996a6d6 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -299,7 +299,7 @@ static void stop_recording(struct btaudio *bta)
 
 static int btaudio_mixer_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct btaudio *bta;
 
 	for (bta = btaudios; bta != NULL; bta = bta->next)
@@ -458,7 +458,7 @@ static int btaudio_dsp_open(struct inode *inode, struct file *file,
 
 static int btaudio_dsp_open_digital(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct btaudio *bta;
 
 	for (bta = btaudios; bta != NULL; bta = bta->next)
@@ -474,7 +474,7 @@ static int btaudio_dsp_open_digital(struct inode *inode, struct file *file)
 
 static int btaudio_dsp_open_analog(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct btaudio *bta;
 
 	for (bta = btaudios; bta != NULL; bta = bta->next)
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 53668ddefe86..599245fbb474 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -1448,7 +1448,7 @@ static int mixer_ioctl(struct cm_state *s, unsigned int cmd, unsigned long arg)
 
 static int cm_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct cm_state *s = devs;
 
 	while (s && s->dev_mixer != minor)
@@ -2207,7 +2207,7 @@ static int cm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
 
 static int cm_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct cm_state *s = devs;
 	unsigned char fmtm = ~0, fmts = 0;
 
@@ -2462,7 +2462,7 @@ static unsigned int cm_midi_poll(struct file *file, struct poll_table_struct *wa
 
 static int cm_midi_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct cm_state *s = devs;
 	unsigned long flags;
 
@@ -2679,7 +2679,7 @@ static int cm_dmfm_ioctl(struct inode *inode, struct file *file, unsigned int cm
 
 static int cm_dmfm_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct cm_state *s = devs;
 
 	while (s && s->dev_dmfm != minor)
diff --git a/sound/oss/cs4281/cs4281m.c b/sound/oss/cs4281/cs4281m.c
index 16b7c1b1e9bc..64a1d696a277 100644
--- a/sound/oss/cs4281/cs4281m.c
+++ b/sound/oss/cs4281/cs4281m.c
@@ -2567,7 +2567,7 @@ static int mixer_ioctl(struct cs4281_state *s, unsigned int cmd,
 
 static int cs4281_open_mixdev(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct cs4281_state *s=NULL;
 	struct list_head *entry;
 
@@ -3624,7 +3624,7 @@ static int cs4281_release(struct inode *inode, struct file *file)
 
 static int cs4281_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct cs4281_state *s=NULL;
 	struct list_head *entry;
 
@@ -3966,7 +3966,7 @@ static unsigned int cs4281_midi_poll(struct file *file,
 static int cs4281_midi_open(struct inode *inode, struct file *file)
 {
 	unsigned long flags, temp1;
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct cs4281_state *s=NULL;
 	struct list_head *entry;
 	list_for_each(entry, &cs4281_devs)
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index 84871cfe2ec6..da4a6daa14ef 100644
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -1838,7 +1838,7 @@ static unsigned int cs_midi_poll(struct file *file, struct poll_table_struct *wa
 
 static int cs_midi_open(struct inode *inode, struct file *file)
 {
-        unsigned int minor = minor(inode->i_rdev);
+        unsigned int minor = iminor(inode);
         struct cs_card *card=NULL;
         unsigned long flags;
 	struct list_head *entry;
@@ -3200,7 +3200,7 @@ static int cs_open(struct inode *inode, struct file *file)
 	struct cs_state *state = NULL;
 	struct dmabuf *dmabuf = NULL;
 	struct list_head *entry;
-        unsigned int minor = minor(inode->i_rdev);
+        unsigned int minor = iminor(inode);
 	int ret=0;
 	unsigned int tmp;
 
@@ -4066,7 +4066,7 @@ static void cs_ac97_set(struct ac97_codec *dev, u8 reg, u16 val)
 static int cs_open_mixdev(struct inode *inode, struct file *file)
 {
 	int i=0;
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct cs_card *card=NULL;
 	struct list_head *entry;
 	unsigned int tmp;
@@ -4113,7 +4113,7 @@ static int cs_open_mixdev(struct inode *inode, struct file *file)
 
 static int cs_release_mixdev(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct cs_card *card=NULL;
 	struct list_head *entry;
 	int i;
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index acbac9810184..e2a8b2ab3961 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -904,7 +904,7 @@ static int sq_open(struct inode *inode, struct file *file)
 	  O_RDONLY and dsp1 could be opened O_WRONLY
 	*/
 
-	dmasound.minDev = minor(inode->i_rdev) & 0x0f;
+	dmasound.minDev = iminor(inode) & 0x0f;
 
 	/* OK. - we should make some attempt at consistency. At least the H'ware
 	   options should be set with a valid mode.  We will make it that the LL
diff --git a/sound/oss/emu10k1/audio.c b/sound/oss/emu10k1/audio.c
index 0c94b8fd6420..c5a00377a5e1 100644
--- a/sound/oss/emu10k1/audio.c
+++ b/sound/oss/emu10k1/audio.c
@@ -1112,7 +1112,7 @@ static int emu10k1_audio_mmap(struct file *file, struct vm_area_struct *vma)
 
 static int emu10k1_audio_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct emu10k1_card *card = NULL;
 	struct list_head *entry;
 	struct emu10k1_wavedevice *wave_dev;
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c
index 5022cc1defaf..06a78997d317 100644
--- a/sound/oss/emu10k1/midi.c
+++ b/sound/oss/emu10k1/midi.c
@@ -86,7 +86,7 @@ static int midiin_add_buffer(struct emu10k1_mididevice *midi_dev, struct midi_hd
 
 static int emu10k1_midi_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct emu10k1_card *card = NULL;
 	struct emu10k1_mididevice *midi_dev;
 	struct list_head *entry;
diff --git a/sound/oss/emu10k1/mixer.c b/sound/oss/emu10k1/mixer.c
index f26e6b5025ec..bc252de3c7df 100644
--- a/sound/oss/emu10k1/mixer.c
+++ b/sound/oss/emu10k1/mixer.c
@@ -654,7 +654,7 @@ static int emu10k1_mixer_ioctl(struct inode *inode, struct file *file, unsigned
 
 static int emu10k1_mixer_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct emu10k1_card *card = NULL;
 	struct list_head *entry;
 
diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index ce7ae906e3cb..6f00a9366d3d 100644
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -1023,7 +1023,7 @@ static int mixer_ioctl(struct es1370_state *s, unsigned int cmd, unsigned long a
 
 static int es1370_open_mixdev(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct list_head *list;
 	struct es1370_state *s;
 
@@ -1727,7 +1727,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 
 static int es1370_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
@@ -2165,7 +2165,7 @@ static int es1370_ioctl_dac(struct inode *inode, struct file *file, unsigned int
 
 static int es1370_open_dac(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
@@ -2408,7 +2408,7 @@ static unsigned int es1370_midi_poll(struct file *file, struct poll_table_struct
 
 static int es1370_midi_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 6d6d42c7b10a..043ed790205c 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -1210,7 +1210,7 @@ static int mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd, unsigned lon
 
 static int es1371_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct list_head *list;
 	struct es1371_state *s;
 
@@ -1914,7 +1914,7 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
 
 static int es1371_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
@@ -2345,7 +2345,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int
 
 static int es1371_open_dac(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
@@ -2587,7 +2587,7 @@ static unsigned int es1371_midi_poll(struct file *file, struct poll_table_struct
 
 static int es1371_midi_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index 5f5dda889b68..0ab2e4ba539c 100644
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -913,7 +913,7 @@ static int mixer_ioctl(struct solo1_state *s, unsigned int cmd, unsigned long ar
 
 static int solo1_open_mixdev(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct solo1_state *s = NULL;
 	struct pci_dev *pci_dev = NULL;
 
@@ -1594,7 +1594,7 @@ static int solo1_release(struct inode *inode, struct file *file)
 
 static int solo1_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	struct solo1_state *s = NULL;
 	struct pci_dev *pci_dev = NULL;
@@ -1884,7 +1884,7 @@ static unsigned int solo1_midi_poll(struct file *file, struct poll_table_struct
 
 static int solo1_midi_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct solo1_state *s = NULL;
@@ -2106,7 +2106,7 @@ static int solo1_dmfm_ioctl(struct inode *inode, struct file *file, unsigned int
 
 static int solo1_dmfm_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	struct solo1_state *s = NULL;
 	struct pci_dev *pci_dev = NULL;
diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c
index 5baa875810b9..6ad89aa8b262 100644
--- a/sound/oss/hal2.c
+++ b/sound/oss/hal2.c
@@ -867,7 +867,7 @@ static int hal2_mixer_ioctl(hal2_card_t *hal2, unsigned int cmd,
 
 static int hal2_open_mixdev(struct inode *inode, struct file *file)
 {
-	hal2_card_t *hal2 = hal2_mixer_find_card(MINOR(inode->i_rdev));
+	hal2_card_t *hal2 = hal2_mixer_find_card(iminor(inode));
 
 	if (hal2) {
 		file->private_data = hal2;
@@ -1242,7 +1242,7 @@ static unsigned int hal2_poll(struct file *file, struct poll_table_struct *wait)
 static int hal2_open(struct inode *inode, struct file *file)
 {
 	int err;
-	hal2_card_t *hal2 = hal2_dsp_find_card(MINOR(inode->i_rdev));
+	hal2_card_t *hal2 = hal2_dsp_find_card(iminor(inode));
 
 	DEBUG("opening audio device.\n");
 
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index 19cdee7e59db..1006ad599d35 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -2648,7 +2648,7 @@ static void i810_ac97_set(struct ac97_codec *dev, u8 reg, u16 data)
 static int i810_open_mixdev(struct inode *inode, struct file *file)
 {
 	int i;
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct i810_card *card = devs;
 
 	for (card = devs; card != NULL; card = card->next) {
diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index ccaadd5f4588..9fab8abd9251 100644
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -867,7 +867,7 @@ static loff_t it8172_llseek(struct file *file, loff_t offset, int origin)
 
 static int it8172_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+	int minor = iminor(inode);
 	struct list_head *list;
 	struct it8172_state *s;
 
@@ -1771,7 +1771,7 @@ static int it8172_ioctl(struct inode *inode, struct file *file,
 
 static int it8172_open(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index f9e332f904a6..2b17c06f7e86 100644
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -2138,7 +2138,7 @@ static int mixer_ioctl(struct ess_card *card, unsigned int cmd, unsigned long ar
 /* --------------------------------------------------------------------- */
 static int ess_open_mixdev(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct ess_card *card = NULL;
 	struct pci_dev *pdev = NULL;
 	struct pci_driver *drvr;
@@ -2983,7 +2983,7 @@ free_buffers(struct ess_state *s)
 static int 
 ess_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct ess_state *s = NULL;
 	unsigned char fmtm = ~0, fmts = 0;
 	struct pci_dev *pdev = NULL;
diff --git a/sound/oss/maestro3.c b/sound/oss/maestro3.c
index 5a49ff4dc8e4..87fe033b9302 100644
--- a/sound/oss/maestro3.c
+++ b/sound/oss/maestro3.c
@@ -1980,7 +1980,7 @@ free_dmabuf(struct pci_dev *pci_dev, struct dmabuf *db)
 
 static int m3_open(struct inode *inode, struct file *file)
 {
-    unsigned int minor = minor(inode->i_rdev);
+    unsigned int minor = iminor(inode);
     struct m3_card *c;
     struct m3_state *s = NULL;
     int i;
@@ -2149,7 +2149,7 @@ out:
 /* OSS /dev/mixer file operation methods */
 static int m3_open_mixdev(struct inode *inode, struct file *file)
 {
-    unsigned int minor = minor(inode->i_rdev);
+    unsigned int minor = iminor(inode);
     struct m3_card *card = devs;
 
     for (card = devs; card != NULL; card = card->next) {
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index b8af0d4653c3..aea4a65f78fb 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -646,7 +646,7 @@ static int mixer_ioctl(unsigned int cmd, unsigned long arg)
 
 static int dev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 
 	if (cmd == OSS_GETVERSION) {
 		int sound_version = SOUND_VERSION;
@@ -758,7 +758,7 @@ static void set_default_audio_parameters(void)
 
 static int dev_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	int err = 0;
 
 	if (minor == dev.dsp_minor) {
@@ -793,7 +793,7 @@ static int dev_open(struct inode *inode, struct file *file)
 
 static int dev_release(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	int err = 0;
 
 	lock_kernel();
@@ -983,7 +983,7 @@ static int dsp_write(const char *buf, size_t len)
 
 static ssize_t dev_read(struct file *file, char *buf, size_t count, loff_t *off)
 {
-	int minor = minor(file->f_dentry->d_inode->i_rdev);
+	int minor = iminor(file->f_dentry->d_inode);
 	if (minor == dev.dsp_minor)
 		return dsp_read(buf, count);
 	else
@@ -992,7 +992,7 @@ static ssize_t dev_read(struct file *file, char *buf, size_t count, loff_t *off)
 
 static ssize_t dev_write(struct file *file, const char *buf, size_t count, loff_t *off)
 {
-	int minor = minor(file->f_dentry->d_inode->i_rdev);
+	int minor = iminor(file->f_dentry->d_inode);
 	if (minor == dev.dsp_minor)
 		return dsp_write(buf, count);
 	else
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index aec5f1511f25..d4b25a6605c7 100644
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -857,7 +857,7 @@ static irqreturn_t vrc5477_ac97_interrupt(int irq, void *dev_id, struct pt_regs
 
 static int vrc5477_ac97_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct list_head *list;
 	struct vrc5477_ac97_state *s;
 
@@ -1569,7 +1569,7 @@ static int vrc5477_ac97_ioctl(struct inode *inode, struct file *file,
 
 static int vrc5477_ac97_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index 1daf2a93ac8d..b6f37d514752 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -1445,7 +1445,7 @@ static int rme96xx_ioctl(struct inode *in, struct file *file, unsigned int cmd,
 
 static int rme96xx_open(struct inode *in, struct file *f)
 {
-	int minor = minor(in->i_rdev);
+	int minor = iminor(in);
 	struct list_head *list;
 	int devnum;
 	rme96xx_info *s;
@@ -1769,7 +1769,7 @@ static struct file_operations rme96xx_audio_fops = {
 
 static int rme96xx_mixer_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct list_head *list;
 	rme96xx_info *s;
 
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 16cf3598616a..904eaf1fd2cf 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -1238,7 +1238,7 @@ static int mixer_ioctl(struct sv_state *s, unsigned int cmd, unsigned long arg)
 
 static int sv_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct list_head *list;
 	struct sv_state *s;
 
@@ -1900,7 +1900,7 @@ static int sv_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
 
 static int sv_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned char fmtm = ~0, fmts = 0;
 	struct list_head *list;
@@ -2149,7 +2149,7 @@ static unsigned int sv_midi_poll(struct file *file, struct poll_table_struct *wa
 
 static int sv_midi_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	unsigned long flags;
 	struct list_head *list;
@@ -2371,7 +2371,7 @@ static int sv_dmfm_ioctl(struct inode *inode, struct file *file, unsigned int cm
 
 static int sv_dmfm_open(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	DECLARE_WAITQUEUE(wait, current);
 	struct list_head *list;
 	struct sv_state *s;
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index e70746b2c836..3b023a9212d8 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -144,7 +144,7 @@ static int get_mixer_levels(caddr_t arg)
 
 static ssize_t sound_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-	int dev = minor(file->f_dentry->d_inode->i_rdev);
+	int dev = iminor(file->f_dentry->d_inode);
 	int ret = -EINVAL;
 
 	/*
@@ -177,7 +177,7 @@ static ssize_t sound_read(struct file *file, char *buf, size_t count, loff_t *pp
 
 static ssize_t sound_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
-	int dev = minor(file->f_dentry->d_inode->i_rdev);
+	int dev = iminor(file->f_dentry->d_inode);
 	int ret = -EINVAL;
 	
 	lock_kernel();
@@ -204,7 +204,7 @@ static ssize_t sound_write(struct file *file, const char *buf, size_t count, lof
 
 static int sound_open(struct inode *inode, struct file *file)
 {
-	int dev = minor(inode->i_rdev);
+	int dev = iminor(inode);
 	int retval;
 
 	DEB(printk("sound_open(dev=%d)\n", dev));
@@ -253,7 +253,7 @@ static int sound_open(struct inode *inode, struct file *file)
 
 static int sound_release(struct inode *inode, struct file *file)
 {
-	int dev = minor(inode->i_rdev);
+	int dev = iminor(inode);
 
 	lock_kernel();
 	DEB(printk("sound_release(dev=%d)\n", dev));
@@ -333,7 +333,7 @@ static int sound_ioctl(struct inode *inode, struct file *file,
 		       unsigned int cmd, unsigned long arg)
 {
 	int err, len = 0, dtype;
-	int dev = minor(inode->i_rdev);
+	int dev = iminor(inode);
 
 	if (_SIOC_DIR(cmd) != _SIOC_NONE && _SIOC_DIR(cmd) != 0) {
 		/*
@@ -396,7 +396,7 @@ static int sound_ioctl(struct inode *inode, struct file *file,
 static unsigned int sound_poll(struct file *file, poll_table * wait)
 {
 	struct inode *inode = file->f_dentry->d_inode;
-	int dev = minor(inode->i_rdev);
+	int dev = iminor(inode);
 
 	DEB(printk("sound_poll(dev=%d)\n", dev));
 	switch (dev & 0x0f) {
@@ -420,7 +420,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma)
 	int dev_class;
 	unsigned long size;
 	struct dma_buffparms *dmap = NULL;
-	int dev = minor(file->f_dentry->d_inode->i_rdev);
+	int dev = iminor(file->f_dentry->d_inode);
 
 	dev_class = dev & 0x0f;
 	dev >>= 4;
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
index a5e17dc1aa6d..8c3f93c42da8 100644
--- a/sound/oss/swarm_cs4297a.c
+++ b/sound/oss/swarm_cs4297a.c
@@ -1537,7 +1537,7 @@ static loff_t cs4297a_llseek(struct file *file, loff_t offset, int origin)
 
 static int cs4297a_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+	int minor = iminor(inode);
 	struct cs4297a_state *s=NULL;
 	struct list_head *entry;
 
@@ -2386,7 +2386,7 @@ static int cs4297a_release(struct inode *inode, struct file *file)
 
 static int cs4297a_open(struct inode *inode, struct file *file)
 {
-	int minor = MINOR(inode->i_rdev);
+	int minor = iminor(inode);
 	struct cs4297a_state *s=NULL;
 	struct list_head *entry;
 
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 117535456d47..415ab1595ac0 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -2600,7 +2600,7 @@ static int trident_ioctl(struct inode *inode, struct file *file, unsigned int cm
 static int trident_open(struct inode *inode, struct file *file)
 {
 	int i = 0;
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct trident_card *card = devs;
 	struct trident_state *state = NULL;
 	struct dmabuf *dmabuf = NULL;
@@ -3883,7 +3883,7 @@ static int ali_write_proc(struct file *file, const char *buffer, unsigned long c
 static int trident_open_mixdev(struct inode *inode, struct file *file)
 {
 	int i = 0;
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct trident_card *card = devs;
 
 	for (card = devs; card != NULL; card = card->next)
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 0a9cbe2da257..1836e6934af2 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -1556,7 +1556,7 @@ out:
 
 static int via_mixer_open (struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct via_info *card;
 	struct pci_dev *pdev = NULL;
 	struct pci_driver *drvr;
@@ -3252,7 +3252,7 @@ static int via_dsp_ioctl (struct inode *inode, struct file *file,
 
 static int via_dsp_open (struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct via_info *card;
 	struct pci_dev *pdev = NULL;
 	struct via_channel *chan;
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c
index 0d4429f1c1db..78fd0bc5afad 100644
--- a/sound/oss/vwsnd.c
+++ b/sound/oss/vwsnd.c
@@ -2916,7 +2916,7 @@ static int vwsnd_audio_mmap(struct file *file, struct vm_area_struct *vma)
 static int vwsnd_audio_open(struct inode *inode, struct file *file)
 {
 	vwsnd_dev_t *devc;
-	dev_t minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	int sw_samplefmt;
 
 	DBGE("(inode=0x%p, file=0x%p)\n", inode, file);
@@ -3063,7 +3063,7 @@ static int vwsnd_mixer_open(struct inode *inode, struct file *file)
 
 	INC_USE_COUNT;
 	for (devc = vwsnd_dev_list; devc; devc = devc->next_dev)
-		if (devc->mixer_minor == minor(inode->i_rdev))
+		if (devc->mixer_minor == iminor(inode))
 			break;
 
 	if (devc == NULL) {
diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index 4da42da30a75..c6183e770dda 100644
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -1905,7 +1905,7 @@ static int ymf_open(struct inode *inode, struct file *file)
 	struct ymf_state *state;
 	int err;
 
-	minor = minor(inode->i_rdev);
+	minor = iminor(inode);
 	if ((minor & 0x0F) == 3) {	/* /dev/dspN */
 		;
 	} else {
@@ -2019,7 +2019,7 @@ static int ymf_release(struct inode *inode, struct file *file)
  */
 static int ymf_open_mixdev(struct inode *inode, struct file *file)
 {
-	int minor = minor(inode->i_rdev);
+	int minor = iminor(inode);
 	struct list_head *list;
 	ymfpci_t *unit;
 	int i;
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 192f7ea9c260..6b675d272de5 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -483,7 +483,7 @@ static struct sound_unit *__look_for_unit(int chain, int unit)
 int soundcore_open(struct inode *inode, struct file *file)
 {
 	int chain;
-	int unit = minor(inode->i_rdev);
+	int unit = iminor(inode);
 	struct sound_unit *s;
 	struct file_operations *new_fops = NULL;