Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffce7a82 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

sound/oss/pss: set_io_base() always returns success, mark it void 



[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 911f2150

sound/oss/pss.c

+7 −23
Original line number Diff line number Diff line
@@ -232,14 +232,12 @@ static int set_irq(pss_confdata * devc, int dev, int irq) 
	return 1;

}



static int set_io_base(pss_confdata * devc, int dev, int base)

static void set_io_base(pss_confdata * devc, int dev, int base)

{

	unsigned short  tmp = inw(REG(dev)) & 0x003f;

	unsigned short  bits = (base & 0x0ffc) << 4;



	outw(bits | tmp, REG(dev));



	return 1;

}



static int set_dma(pss_confdata * devc, int dev, int dma)
@@ -673,20 +671,12 @@ static void configure_nonsound_components(void) 


	/* Configure CDROM port */



	if(pss_cdrom_port == -1)	/* If cdrom port enablation wasn't requested */

	{

	if (pss_cdrom_port == -1) {	/* If cdrom port enablation wasn't requested */

		printk(KERN_INFO "PSS: CDROM port not enabled.\n");

	}

	else if(check_region(pss_cdrom_port, 2))

	{

	} else if (check_region(pss_cdrom_port, 2)) {

		printk(KERN_ERR "PSS: CDROM I/O port conflict.\n");

	}

	else if(!set_io_base(devc, CONF_CDROM, pss_cdrom_port))

	{

		printk(KERN_ERR "PSS: CDROM I/O port could not be set.\n");

	}

	else					/* CDROM port successfully configured */

	{

	} else {

		set_io_base(devc, CONF_CDROM, pss_cdrom_port);

		printk(KERN_INFO "PSS: CDROM I/O port set to 0x%x.\n", pss_cdrom_port);

	}

}
@@ -758,10 +748,7 @@ static int __init probe_pss_mpu(struct address_info *hw_config) 
		printk(KERN_ERR "PSS: MPU I/O port conflict\n");

		return 0;

	}

	if (!set_io_base(devc, CONF_MIDI, hw_config->io_base)) {

		printk(KERN_ERR "PSS: MIDI base could not be set.\n");

		goto fail;

	}

	set_io_base(devc, CONF_MIDI, hw_config->io_base);

	if (!set_irq(devc, CONF_MIDI, hw_config->irq)) {

		printk(KERN_ERR "PSS: MIDI IRQ allocation error.\n");

		goto fail;
@@ -1057,10 +1044,7 @@ static int __init probe_pss_mss(struct address_info *hw_config) 
		release_region(hw_config->io_base, 4);

		return 0;

	}

	if (!set_io_base(devc, CONF_WSS, hw_config->io_base)) {

		printk("PSS: WSS base not settable.\n");

		goto fail;

	}

	set_io_base(devc, CONF_WSS, hw_config->io_base);

	if (!set_irq(devc, CONF_WSS, hw_config->irq)) {

		printk("PSS: WSS IRQ allocation error.\n");

		goto fail;