summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS6
-rw-r--r--arch/alpha/kernel/sys_marvel.c7
-rw-r--r--arch/x86_64/kernel/pci-gart.c6
-rw-r--r--drivers/media/video/Kconfig10
-rw-r--r--drivers/pci/hotplug/cpqphp_core.c1
-rw-r--r--drivers/pci/hotplug/cpqphp_nvram.c1
-rw-r--r--drivers/pci/names.c6
-rw-r--r--drivers/pci/pci-driver.c6
-rw-r--r--drivers/pci/setup-bus.c5
-rw-r--r--drivers/usb/media/se401.c3
-rw-r--r--drivers/usb/media/stv680.c3
-rw-r--r--drivers/usb/media/usbvideo.c2
-rw-r--r--fs/cramfs/inode.c3
-rw-r--r--include/linux/pci.h37
14 files changed, 53 insertions, 43 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index adb9338ac130..8648ee7035a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -437,10 +437,8 @@ M: hpa@zytor.com
S: Maintained
CRAMFS FILESYSTEM
-P: Daniel Quinlan
-M: quinlan@transmeta.com
-W: http://sourceforge.net/projects/cramfs/
-S: Maintained
+W: http://sourceforge.net/projects/cramfs/
+S: Orphan
CREDITS FILE
P: John A. Martin
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index c5b58f01a790..561122beae58 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -33,13 +33,6 @@
# error NR_IRQS < MARVEL_NR_IRQS !!!
#endif
-/* ??? Should probably be generic. */
-#ifdef CONFIG_PCI_NAMES
-#define pci_pretty_name(x) ((x)->pretty_name)
-#else
-#define pci_pretty_name(x) ""
-#endif
-
/*
* Interrupt handling.
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 6e97e0daa765..6842d5823465 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -31,12 +31,6 @@
#include <asm/kdebug.h>
#include <asm/proto.h>
-#ifdef CONFIG_PCI_NAMES
-#define pci_pretty_name(dev) ((dev)->pretty_name)
-#else
-#define pci_pretty_name(dev) ""
-#endif
-
dma_addr_t bad_dma_address;
unsigned long iommu_bus_base; /* GART remapping area (physical) */
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 50e706e6a0e8..f8ec5b51bcfb 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -5,16 +5,6 @@
menu "Video For Linux"
depends on VIDEO_DEV!=n
-config VIDEO_PROC_FS
- bool "V4L information in proc filesystem"
- depends on PROC_FS
- help
- If you say Y here, you are able to access video device information
- in /proc/video.
-
- To use this option, you have to check, that the "/proc file system
- support" (CONFIG_PROC_FS) is enabled too.
-
comment "Video Adapters"
config VIDEO_BT848
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index c6e0477f3f26..fdee2e4e10d0 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -34,7 +34,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/proc_fs.h>
-#include <linux/miscdevice.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index d137e6c33097..18afaabd2cbf 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/proc_fs.h>
-#include <linux/miscdevice.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
diff --git a/drivers/pci/names.c b/drivers/pci/names.c
index 121ad4b52319..eb707bf79dda 100644
--- a/drivers/pci/names.c
+++ b/drivers/pci/names.c
@@ -80,14 +80,14 @@ void __devinit pci_name_device(struct pci_dev *dev)
}
/* Ok, found the vendor, but unknown device */
- sprintf(name, "PCI device %04x:%04x (%." DEVICE_NAME_HALF "s)",
+ sprintf(name, "PCI device %04x:%04x (%." PCI_NAME_HALF "s)",
dev->vendor, dev->device, vendor_p->name);
return;
/* Full match */
match_device: {
- char *n = name + sprintf(name, "%." DEVICE_NAME_HALF
- "s %." DEVICE_NAME_HALF "s",
+ char *n = name + sprintf(name, "%." PCI_NAME_HALF
+ "s %." PCI_NAME_HALF "s",
vendor_p->name, device_p->name);
int nr = device_p->seen + 1;
device_p->seen = nr;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 85eff134e4aa..640681c93bdc 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -122,10 +122,8 @@ __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
if (!pci_dev->driver && drv->probe) {
error = pci_device_probe_static(drv, pci_dev);
- if (error >= 0)
- return error;
-
- error = pci_device_probe_dynamic(drv, pci_dev);
+ if (error == -ENODEV)
+ error = pci_device_probe_dynamic(drv, pci_dev);
}
return error;
}
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 3df69cf7bf29..55f85c051f1c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -203,11 +203,6 @@ pci_setup_bridge(struct pci_bus *bus)
Enable ISA in either case (FIXME!). */
l = (bus->resource[0]->flags & IORESOURCE_BUS_HAS_VGA) ? 0x0c : 0x04;
pci_write_config_word(bridge, PCI_BRIDGE_CONTROL, l);
-
- /* Make sure the bridge COMMAND register has the appropriate
- bits set, just in case...
- */
- pcibios_enable_device(bridge, 0xfff);
}
/* Check whether the bridge supports optional I/O and
diff --git a/drivers/usb/media/se401.c b/drivers/usb/media/se401.c
index 8e9928c78e42..9be1d6e76a75 100644
--- a/drivers/usb/media/se401.c
+++ b/drivers/usb/media/se401.c
@@ -130,6 +130,9 @@ static void rvfree(void *mem, unsigned long size)
*
***************************************************************************/
+#warning please convert me from procfs to sysfs
+#undef CONFIG_VIDEO_PROC_FS
+
#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
static struct proc_dir_entry *se401_proc_entry = NULL;
diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index 563bbcfd27bb..b1d44efb72bb 100644
--- a/drivers/usb/media/stv680.c
+++ b/drivers/usb/media/stv680.c
@@ -519,6 +519,9 @@ exit:
* /proc interface
*******************************************************************/
+#warning please convert me from procfs to sysfs
+#undef CONFIG_VIDEO_PROC_FS
+
#if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
static struct proc_dir_entry *stv680_proc_entry = NULL;
diff --git a/drivers/usb/media/usbvideo.c b/drivers/usb/media/usbvideo.c
index 9f85a9a8cdc0..a0745a30e499 100644
--- a/drivers/usb/media/usbvideo.c
+++ b/drivers/usb/media/usbvideo.c
@@ -37,6 +37,8 @@
static int video_nr = -1;
MODULE_PARM(video_nr, "i");
+#warning please convert me from procfs to sysfs
+#define USES_PROC_FS 0
/*
* Local prototypes.
*/
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 5d94a4324d9a..1789afd1298d 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -218,7 +218,8 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
/* check at 512 byte offset */
memcpy(&super, cramfs_read(sb, 512, sizeof(super)), sizeof(super));
if (super.magic != CRAMFS_MAGIC) {
- printk(KERN_ERR "cramfs: wrong magic\n");
+ if (!silent)
+ printk(KERN_ERR "cramfs: wrong magic\n");
goto out;
}
}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a4c7a4c7965e..3c4fc6c62773 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -420,7 +420,9 @@ struct pci_dev {
unsigned int transparent:1; /* Transparent PCI bridge */
unsigned int multifunction:1;/* Part of multi-function device */
#ifdef CONFIG_PCI_NAMES
- char pretty_name[DEVICE_NAME_SIZE]; /* pretty name for users to see */
+#define PCI_NAME_SIZE 50
+#define PCI_NAME_HALF __stringify(20) /* less than half to handle slop */
+ char pretty_name[PCI_NAME_SIZE]; /* pretty name for users to see */
#endif
};
@@ -524,6 +526,32 @@ struct pci_driver {
#define to_pci_driver(drv) container_of(drv,struct pci_driver, driver)
+/**
+ * PCI_DEVICE - macro used to describe a specific pci device
+ * @vend: the 16 bit PCI Vendor ID
+ * @dev: the 16 bit PCI Device ID
+ *
+ * This macro is used to create a struct pci_device_id that matches a
+ * specific device. The subvendor and subdevice fields will be set to
+ * PCI_ANY_ID.
+ */
+#define PCI_DEVICE(vend,dev) \
+ .vendor = (vend), .device = (dev), \
+ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
+
+/**
+ * PCI_DEVICE_CLASS - macro used to describe a specific pci device class
+ * @dev_class: the class, subclass, prog-if triple for this device
+ * @dev_class_mask: the class mask for this device
+ *
+ * This macro is used to create a struct pci_device_id that matches a
+ * specific PCI class. The vendor, device, subvendor, and subdevice
+ * fields will be set to PCI_ANY_ID.
+ */
+#define PCI_DEVICE_CLASS(dev_class,dev_class_mask) \
+ .class = (dev_class), .class_mask = (dev_class_mask), \
+ .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
+ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
/* these external functions are only available when PCI support is enabled */
#ifdef CONFIG_PCI
@@ -814,6 +842,13 @@ static inline char *pci_name(struct pci_dev *pdev)
return pdev->dev.bus_id;
}
+/* Some archs want to see the pretty pci name, so use this macro */
+#ifdef CONFIG_PCI_NAMES
+#define pci_pretty_name(dev) ((dev)->pretty_name)
+#else
+#define pci_pretty_name(dev) ""
+#endif
+
/*
* The world is not perfect and supplies us with broken PCI devices.
* For at least a part of these bugs we need a work-around, so both
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-08 15:09:12 +0000