Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] aic7xxx: fix warnings with CONFIG_PM disabled

Browse Source 
CC [M]  drivers/scsi/aic7xxx/aic7xxx_osm_pci.o
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:148: warning: 'ahc_linux_pci_dev_suspend' defined but not used
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c:166: warning: 'ahc_linux_pci_dev_resume' defined but not used

This moves aic7xxx_pci_driver struct, removes some forward declarations,
and adds some ifdef CONFIG_PM.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori 2008-01-27 00:08:19 +09:00 committed by James Bottomley
parent 67eb63364e
commit 03e7925d07
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/aic7xxx/aic7xxx.h
View File

@ -1143,7 +1143,9 @@ struct ahc_pci_identity *ahc_find_pci_device(ahc_dev_softc_t);
int ahc_pci_config(struct ahc_softc *, int ahc_pci_config(struct ahc_softc *,
struct ahc_pci_identity *); struct ahc_pci_identity *);
int ahc_pci_test_register_access(struct ahc_softc *); int ahc_pci_test_register_access(struct ahc_softc *);
#ifdef CONFIG_PM
void ahc_pci_resume(struct ahc_softc *ahc); void ahc_pci_resume(struct ahc_softc *ahc);
#endif
/*************************** EISA/VL Front End ********************************/ /*************************** EISA/VL Front End ********************************/
struct aic7770_identity *aic7770_find_device(uint32_t); struct aic7770_identity *aic7770_find_device(uint32_t);
@ -1170,8 +1172,10 @@ int ahc_chip_init(struct ahc_softc *ahc);
int ahc_init(struct ahc_softc *ahc); int ahc_init(struct ahc_softc *ahc);
void ahc_intr_enable(struct ahc_softc *ahc, int enable); void ahc_intr_enable(struct ahc_softc *ahc, int enable);
void ahc_pause_and_flushwork(struct ahc_softc *ahc); void ahc_pause_and_flushwork(struct ahc_softc *ahc);
#ifdef CONFIG_PM
int ahc_suspend(struct ahc_softc *ahc); int ahc_suspend(struct ahc_softc *ahc);
int ahc_resume(struct ahc_softc *ahc); int ahc_resume(struct ahc_softc *ahc);
#endif
void ahc_set_unit(struct ahc_softc *, int); void ahc_set_unit(struct ahc_softc *, int);
void ahc_set_name(struct ahc_softc *, char *); void ahc_set_name(struct ahc_softc *, char *);
void ahc_alloc_scbs(struct ahc_softc *ahc); void ahc_alloc_scbs(struct ahc_softc *ahc);

3
drivers/scsi/aic7xxx/aic7xxx_core.c
View File

@ -5078,6 +5078,7 @@ ahc_pause_and_flushwork(struct ahc_softc *ahc)
ahc->flags &= ~AHC_ALL_INTERRUPTS; ahc->flags &= ~AHC_ALL_INTERRUPTS;
} }
#ifdef CONFIG_PM
int int
ahc_suspend(struct ahc_softc *ahc) ahc_suspend(struct ahc_softc *ahc)
{ {
@ -5113,7 +5114,7 @@ ahc_resume(struct ahc_softc *ahc)
ahc_restart(ahc); ahc_restart(ahc);
return (0); return (0);
} }
#endif
/************************** Busy Target Table *********************************/ /************************** Busy Target Table *********************************/
/* /*
* Return the untagged transaction id for a given target/channel lun. * Return the untagged transaction id for a given target/channel lun.

33
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
View File

@ -42,17 +42,6 @@
#include "aic7xxx_osm.h" #include "aic7xxx_osm.h"
#include "aic7xxx_pci.h" #include "aic7xxx_pci.h"
static int ahc_linux_pci_dev_probe(struct pci_dev *pdev,
const struct pci_device_id *ent);
static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
u_long *base);
static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
u_long *bus_addr,
uint8_t __iomem **maddr);
static int ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg);
static int ahc_linux_pci_dev_resume(struct pci_dev *pdev);
static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips. /* Define the macro locally since it's different for different class of chips.
*/ */
#define ID(x) ID_C(x, PCI_CLASS_STORAGE_SCSI) #define ID(x) ID_C(x, PCI_CLASS_STORAGE_SCSI)
@ -132,17 +121,7 @@ static struct pci_device_id ahc_linux_pci_id_table[] = {
MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table); MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
static struct pci_driver aic7xxx_pci_driver = {
.name = "aic7xxx",
.probe = ahc_linux_pci_dev_probe,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = ahc_linux_pci_dev_suspend,
.resume = ahc_linux_pci_dev_resume,
#endif
.remove = ahc_linux_pci_dev_remove,
.id_table = ahc_linux_pci_id_table
};
static int static int
ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg) ahc_linux_pci_dev_suspend(struct pci_dev *pdev, pm_message_t mesg)
{ {
@ -182,6 +161,7 @@ ahc_linux_pci_dev_resume(struct pci_dev *pdev)
return (ahc_resume(ahc)); return (ahc_resume(ahc));
} }
#endif
static void static void
ahc_linux_pci_dev_remove(struct pci_dev *pdev) ahc_linux_pci_dev_remove(struct pci_dev *pdev)
@ -289,6 +269,17 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return (0); return (0);
} }
static struct pci_driver aic7xxx_pci_driver = {
.name = "aic7xxx",
.probe = ahc_linux_pci_dev_probe,
#ifdef CONFIG_PM
.suspend = ahc_linux_pci_dev_suspend,
.resume = ahc_linux_pci_dev_resume,
#endif
.remove = ahc_linux_pci_dev_remove,
.id_table = ahc_linux_pci_id_table
};
int int
ahc_linux_pci_init(void) ahc_linux_pci_init(void)
{ {

2
drivers/scsi/aic7xxx/aic7xxx_pci.c
View File

@ -2020,6 +2020,7 @@ ahc_pci_chip_init(struct ahc_softc *ahc)
return (ahc_chip_init(ahc)); return (ahc_chip_init(ahc));
} }
#ifdef CONFIG_PM
void void
ahc_pci_resume(struct ahc_softc *ahc) ahc_pci_resume(struct ahc_softc *ahc)
{ {
@ -2051,6 +2052,7 @@ ahc_pci_resume(struct ahc_softc *ahc)
ahc_release_seeprom(&sd); ahc_release_seeprom(&sd);
} }
} }
#endif
static int static int
ahc_aic785X_setup(struct ahc_softc *ahc) ahc_aic785X_setup(struct ahc_softc *ahc)