aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-09-29 05:00:18 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:13 -0400
commit99f932f02627b211f7efa9602ddc389d1ccbed2b (patch)
tree3c06304b982117a0e81f3c116664d39ac72f93c2 /sound/oss
parentaadcc2eef70640302805a6bb8c0f2a485779eea3 (diff)
[PATCH] CONFIG_PM=n slim: sound/oss/cs46xx.c
Remove some code which is unneeded if CONFIG_PM=n. * Make suspend/resume registration look like the rest of drivers: #ifdef CONFIG_PM in struct pci_driver, prototypes, actual hooks. * Drop CS46XX_ACPI_SUPPORT. It logically duplicated CONFIG_PM. It was hardcoded to 1 approx forever (ALSA merge just moved driver to sound/oss/). * After previous point, sound/oss/cs46xxpm-24.h removed as being useless. * As side effect selling (unused) static inline functions as suspend/resume hooks funkiness removed too. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/cs46xx.c12
-rw-r--r--sound/oss/cs46xxpm-24.h48
2 files changed, 8 insertions, 52 deletions
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index 5195bf933cb8..3f81b79afbaa 100644
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -96,7 +96,7 @@
96#include <asm/dma.h> 96#include <asm/dma.h>
97#include <asm/uaccess.h> 97#include <asm/uaccess.h>
98 98
99#include "cs46xxpm-24.h" 99#include "cs46xxpm.h"
100#include "cs46xx_wrapper-24.h" 100#include "cs46xx_wrapper-24.h"
101#include "cs461x.h" 101#include "cs461x.h"
102 102
@@ -389,8 +389,10 @@ static int cs_hardware_init(struct cs_card *card);
389static int cs46xx_powerup(struct cs_card *card, unsigned int type); 389static int cs46xx_powerup(struct cs_card *card, unsigned int type);
390static int cs461x_powerdown(struct cs_card *card, unsigned int type, int suspendflag); 390static int cs461x_powerdown(struct cs_card *card, unsigned int type, int suspendflag);
391static void cs461x_clear_serial_FIFOs(struct cs_card *card, int type); 391static void cs461x_clear_serial_FIFOs(struct cs_card *card, int type);
392#ifdef CONFIG_PM
392static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state); 393static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state);
393static int cs46xx_resume_tbl(struct pci_dev *pcidev); 394static int cs46xx_resume_tbl(struct pci_dev *pcidev);
395#endif
394 396
395#if CSDEBUG 397#if CSDEBUG
396 398
@@ -5389,8 +5391,10 @@ static struct pci_driver cs46xx_pci_driver = {
5389 .id_table = cs46xx_pci_tbl, 5391 .id_table = cs46xx_pci_tbl,
5390 .probe = cs46xx_probe, 5392 .probe = cs46xx_probe,
5391 .remove = __devexit_p(cs46xx_remove), 5393 .remove = __devexit_p(cs46xx_remove),
5392 .suspend = CS46XX_SUSPEND_TBL, 5394#ifdef CONFIG_PM
5393 .resume = CS46XX_RESUME_TBL, 5395 .suspend = cs46xx_suspend_tbl,
5396 .resume = cs46xx_resume_tbl,
5397#endif
5394}; 5398};
5395 5399
5396static int __init cs46xx_init_module(void) 5400static int __init cs46xx_init_module(void)
@@ -5420,7 +5424,7 @@ static void __exit cs46xx_cleanup_module(void)
5420module_init(cs46xx_init_module); 5424module_init(cs46xx_init_module);
5421module_exit(cs46xx_cleanup_module); 5425module_exit(cs46xx_cleanup_module);
5422 5426
5423#if CS46XX_ACPI_SUPPORT 5427#ifdef CONFIG_PM
5424static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state) 5428static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state)
5425{ 5429{
5426 struct cs_card *s = PCI_GET_DRIVER_DATA(pcidev); 5430 struct cs_card *s = PCI_GET_DRIVER_DATA(pcidev);
diff --git a/sound/oss/cs46xxpm-24.h b/sound/oss/cs46xxpm-24.h
deleted file mode 100644
index ad82db84d013..000000000000
--- a/sound/oss/cs46xxpm-24.h
+++ /dev/null
@@ -1,48 +0,0 @@
1/*******************************************************************************
2*
3* "cs46xxpm-24.h" -- Cirrus Logic-Crystal CS46XX linux audio driver.
4*
5* Copyright (C) 2000,2001 Cirrus Logic Corp.
6* -- tom woller (twoller@crystal.cirrus.com) or
7* (pcaudio@crystal.cirrus.com).
8*
9* This program is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License as published by
11* the Free Software Foundation; either version 2 of the License, or
12* (at your option) any later version.
13*
14* This program is distributed in the hope that it will be useful,
15* but WITHOUT ANY WARRANTY; without even the implied warranty of
16* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17* GNU General Public License for more details.
18*
19* You should have received a copy of the GNU General Public License
20* along with this program; if not, write to the Free Software
21* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22*
23* 12/22/00 trw - new file.
24*
25*******************************************************************************/
26#ifndef __CS46XXPM24_H
27#define __CS46XXPM24_H
28
29#include <linux/pm.h>
30#include "cs46xxpm.h"
31
32
33#define CS46XX_ACPI_SUPPORT 1
34#ifdef CS46XX_ACPI_SUPPORT
35/*
36* for now (12/22/00) only enable the pm_register PM support.
37* allow these table entries to be null.
38*/
39static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state);
40static int cs46xx_resume_tbl(struct pci_dev *pcidev);
41#define CS46XX_SUSPEND_TBL cs46xx_suspend_tbl
42#define CS46XX_RESUME_TBL cs46xx_resume_tbl
43#else
44#define CS46XX_SUSPEND_TBL cs46xx_null
45#define CS46XX_RESUME_TBL cs46xx_null
46#endif
47
48#endif