diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-12-12 03:37:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 11:57:44 -0500 |
commit | afd1a0c9ac281eed3b22b293ccd92af7b0d60889 (patch) | |
tree | 686c03cf1a1a2efb1fba6dc6e682fbb48edc7c58 /drivers/media/video/saa7134 | |
parent | 808824b5f73e361503420ee318ca9689781da034 (diff) |
[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3
Clean up whitespaces at v4l/dvb files
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 16 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 8 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-oss.c | 86 |
3 files changed, 55 insertions, 55 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index cdd1ed9c8065..cf1e0c2b0351 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
@@ -523,7 +523,7 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind) | |||
523 | h->standard = 0; | 523 | h->standard = 0; |
524 | 524 | ||
525 | i2c_set_clientdata(&h->client, h); | 525 | i2c_set_clientdata(&h->client, h); |
526 | i2c_attach_client(&h->client); | 526 | i2c_attach_client(&h->client); |
527 | return 0; | 527 | return 0; |
528 | } | 528 | } |
529 | 529 | ||
@@ -597,19 +597,19 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
597 | 597 | ||
598 | static struct i2c_driver driver = { | 598 | static struct i2c_driver driver = { |
599 | .owner = THIS_MODULE, | 599 | .owner = THIS_MODULE, |
600 | .name = "i2c saa6752hs MPEG encoder", | 600 | .name = "i2c saa6752hs MPEG encoder", |
601 | .id = I2C_DRIVERID_SAA6752HS, | 601 | .id = I2C_DRIVERID_SAA6752HS, |
602 | .flags = I2C_DF_NOTIFY, | 602 | .flags = I2C_DF_NOTIFY, |
603 | .attach_adapter = saa6752hs_probe, | 603 | .attach_adapter = saa6752hs_probe, |
604 | .detach_client = saa6752hs_detach, | 604 | .detach_client = saa6752hs_detach, |
605 | .command = saa6752hs_command, | 605 | .command = saa6752hs_command, |
606 | }; | 606 | }; |
607 | 607 | ||
608 | static struct i2c_client client_template = | 608 | static struct i2c_client client_template = |
609 | { | 609 | { |
610 | .name = "saa6752hs", | 610 | .name = "saa6752hs", |
611 | .flags = I2C_CLIENT_ALLOW_USE, | 611 | .flags = I2C_CLIENT_ALLOW_USE, |
612 | .driver = &driver, | 612 | .driver = &driver, |
613 | }; | 613 | }; |
614 | 614 | ||
615 | static int __init saa6752hs_init_module(void) | 615 | static int __init saa6752hs_init_module(void) |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index 263c6e2e3e8e..f2788ebb59a8 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -59,7 +59,7 @@ module_param_array(index, int, NULL, 0444); | |||
59 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); | 59 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); |
60 | 60 | ||
61 | #define dprintk(fmt, arg...) if (debug) \ | 61 | #define dprintk(fmt, arg...) if (debug) \ |
62 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) | 62 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) |
63 | 63 | ||
64 | /* | 64 | /* |
65 | * Main chip structure | 65 | * Main chip structure |
@@ -208,8 +208,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, | |||
208 | 208 | ||
209 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) | 209 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) |
210 | { | 210 | { |
211 | struct saa7134_dmasound *dmasound = dev_id; | 211 | struct saa7134_dmasound *dmasound = dev_id; |
212 | struct saa7134_dev *dev = dmasound->priv_data; | 212 | struct saa7134_dev *dev = dmasound->priv_data; |
213 | 213 | ||
214 | unsigned long report, status; | 214 | unsigned long report, status; |
215 | int loop, handled = 0; | 215 | int loop, handled = 0; |
@@ -985,7 +985,7 @@ static int saa7134_alsa_init(void) | |||
985 | struct saa7134_dev *dev = NULL; | 985 | struct saa7134_dev *dev = NULL; |
986 | struct list_head *list; | 986 | struct list_head *list; |
987 | 987 | ||
988 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); | 988 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); |
989 | 989 | ||
990 | list_for_each(list,&saa7134_devlist) { | 990 | list_for_each(list,&saa7134_devlist) { |
991 | dev = list_entry(list, struct saa7134_dev, devlist); | 991 | dev = list_entry(list, struct saa7134_dev, devlist); |
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index 5a579194e455..1f68b9f3fdec 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -782,36 +782,36 @@ struct file_operations saa7134_mixer_fops = { | |||
782 | 782 | ||
783 | static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) | 783 | static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) |
784 | { | 784 | { |
785 | struct saa7134_dmasound *dmasound = dev_id; | 785 | struct saa7134_dmasound *dmasound = dev_id; |
786 | struct saa7134_dev *dev = dmasound->priv_data; | 786 | struct saa7134_dev *dev = dmasound->priv_data; |
787 | unsigned long report, status; | 787 | unsigned long report, status; |
788 | int loop, handled = 0; | 788 | int loop, handled = 0; |
789 | 789 | ||
790 | for (loop = 0; loop < 10; loop++) { | 790 | for (loop = 0; loop < 10; loop++) { |
791 | report = saa_readl(SAA7134_IRQ_REPORT); | 791 | report = saa_readl(SAA7134_IRQ_REPORT); |
792 | status = saa_readl(SAA7134_IRQ_STATUS); | 792 | status = saa_readl(SAA7134_IRQ_STATUS); |
793 | 793 | ||
794 | if (report & SAA7134_IRQ_REPORT_DONE_RA3) { | 794 | if (report & SAA7134_IRQ_REPORT_DONE_RA3) { |
795 | handled = 1; | 795 | handled = 1; |
796 | saa_writel(SAA7134_IRQ_REPORT,report); | 796 | saa_writel(SAA7134_IRQ_REPORT,report); |
797 | saa7134_irq_oss_done(dev, status); | 797 | saa7134_irq_oss_done(dev, status); |
798 | } else { | 798 | } else { |
799 | goto out; | 799 | goto out; |
800 | } | 800 | } |
801 | } | 801 | } |
802 | 802 | ||
803 | if (loop == 10) { | 803 | if (loop == 10) { |
804 | dprintk("error! looping IRQ!"); | 804 | dprintk("error! looping IRQ!"); |
805 | } | 805 | } |
806 | out: | 806 | out: |
807 | return IRQ_RETVAL(handled); | 807 | return IRQ_RETVAL(handled); |
808 | } | 808 | } |
809 | 809 | ||
810 | int saa7134_oss_init1(struct saa7134_dev *dev) | 810 | int saa7134_oss_init1(struct saa7134_dev *dev) |
811 | { | 811 | { |
812 | 812 | ||
813 | if ((request_irq(dev->pci->irq, saa7134_oss_irq, | 813 | if ((request_irq(dev->pci->irq, saa7134_oss_irq, |
814 | SA_SHIRQ | SA_INTERRUPT, dev->name, | 814 | SA_SHIRQ | SA_INTERRUPT, dev->name, |
815 | (void*) &dev->dmasound)) < 0) | 815 | (void*) &dev->dmasound)) < 0) |
816 | return -1; | 816 | return -1; |
817 | 817 | ||
@@ -905,7 +905,7 @@ static int saa7134_dsp_create(struct saa7134_dev *dev) | |||
905 | 905 | ||
906 | err = dev->dmasound.minor_dsp = | 906 | err = dev->dmasound.minor_dsp = |
907 | register_sound_dsp(&saa7134_dsp_fops, | 907 | register_sound_dsp(&saa7134_dsp_fops, |
908 | dsp_nr[dev->nr]); | 908 | dsp_nr[dev->nr]); |
909 | if (err < 0) { | 909 | if (err < 0) { |
910 | goto fail; | 910 | goto fail; |
911 | } | 911 | } |
@@ -923,7 +923,7 @@ static int saa7134_dsp_create(struct saa7134_dev *dev) | |||
923 | return 0; | 923 | return 0; |
924 | 924 | ||
925 | fail: | 925 | fail: |
926 | unregister_sound_dsp(dev->dmasound.minor_dsp); | 926 | unregister_sound_dsp(dev->dmasound.minor_dsp); |
927 | return 0; | 927 | return 0; |
928 | 928 | ||
929 | 929 | ||
@@ -956,49 +956,49 @@ static int oss_device_exit(struct saa7134_dev *dev) | |||
956 | 956 | ||
957 | static int saa7134_oss_init(void) | 957 | static int saa7134_oss_init(void) |
958 | { | 958 | { |
959 | struct saa7134_dev *dev = NULL; | 959 | struct saa7134_dev *dev = NULL; |
960 | struct list_head *list; | 960 | struct list_head *list; |
961 | 961 | ||
962 | printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n"); | 962 | printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n"); |
963 | 963 | ||
964 | list_for_each(list,&saa7134_devlist) { | 964 | list_for_each(list,&saa7134_devlist) { |
965 | dev = list_entry(list, struct saa7134_dev, devlist); | 965 | dev = list_entry(list, struct saa7134_dev, devlist); |
966 | if (dev->dmasound.priv_data == NULL) { | 966 | if (dev->dmasound.priv_data == NULL) { |
967 | oss_device_init(dev); | 967 | oss_device_init(dev); |
968 | } else { | 968 | } else { |
969 | printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); | 969 | printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); |
970 | return -EBUSY; | 970 | return -EBUSY; |
971 | } | 971 | } |
972 | } | 972 | } |
973 | 973 | ||
974 | if (dev == NULL) | 974 | if (dev == NULL) |
975 | printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); | 975 | printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); |
976 | 976 | ||
977 | dmasound_init = oss_device_init; | 977 | dmasound_init = oss_device_init; |
978 | dmasound_exit = oss_device_exit; | 978 | dmasound_exit = oss_device_exit; |
979 | 979 | ||
980 | return 0; | 980 | return 0; |
981 | 981 | ||
982 | } | 982 | } |
983 | 983 | ||
984 | static void saa7134_oss_exit(void) | 984 | static void saa7134_oss_exit(void) |
985 | { | 985 | { |
986 | struct saa7134_dev *dev = NULL; | 986 | struct saa7134_dev *dev = NULL; |
987 | struct list_head *list; | 987 | struct list_head *list; |
988 | 988 | ||
989 | list_for_each(list,&saa7134_devlist) { | 989 | list_for_each(list,&saa7134_devlist) { |
990 | dev = list_entry(list, struct saa7134_dev, devlist); | 990 | dev = list_entry(list, struct saa7134_dev, devlist); |
991 | 991 | ||
992 | /* Device isn't registered by OSS, probably ALSA's */ | 992 | /* Device isn't registered by OSS, probably ALSA's */ |
993 | if (!dev->dmasound.minor_dsp) | 993 | if (!dev->dmasound.minor_dsp) |
994 | continue; | 994 | continue; |
995 | 995 | ||
996 | oss_device_exit(dev); | 996 | oss_device_exit(dev); |
997 | } | 997 | } |
998 | 998 | ||
999 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); | 999 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); |
1000 | 1000 | ||
1001 | return; | 1001 | return; |
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | module_init(saa7134_oss_init); | 1004 | module_init(saa7134_oss_init); |