diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2013-04-16 14:12:17 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-04-17 14:07:36 +0200 |
| commit | cb65a669f62ecca123cf4f6998903ee628c59caf (patch) | |
| tree | d5083643099374154de1b6ef973d9e58b31f8f23 /arch/s390 | |
| parent | a2ab833360abbed3321fd694b69a5a32ee15785f (diff) | |
| download | blackbird-op-linux-cb65a669f62ecca123cf4f6998903ee628c59caf.tar.gz blackbird-op-linux-cb65a669f62ecca123cf4f6998903ee628c59caf.zip | |
s390/pci: do not modify function handles
Don't modify function handles to get a disabled handle - call
clp_disable_fh. With this change we also do no longer deconfigure
enabled functions.
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/pci.h | 1 | ||||
| -rw-r--r-- | arch/s390/pci/pci.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 05333b7f0469..6c1801235db9 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -140,6 +140,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev) struct zpci_dev *zpci_alloc_device(void); int zpci_create_device(struct zpci_dev *); int zpci_enable_device(struct zpci_dev *); +int zpci_disable_device(struct zpci_dev *); void zpci_stop_device(struct zpci_dev *); void zpci_free_device(struct zpci_dev *); int zpci_scan_device(struct zpci_dev *); diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 20823f022925..24dcf059f061 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -955,6 +955,13 @@ out: } EXPORT_SYMBOL_GPL(zpci_enable_device); +int zpci_disable_device(struct zpci_dev *zdev) +{ + zpci_dma_exit_device(zdev); + return clp_disable_fh(zdev); +} +EXPORT_SYMBOL_GPL(zpci_disable_device); + int zpci_create_device(struct zpci_dev *zdev) { int rc; |
