microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

PCI: fix compiler warnings in pci_get_subsys() 

pci_get_subsys() changed in 2.6.26 so that the from pointer is modified
when the call is being invoked, so fix up the 'const' marking of it that
the compiler is complaining about.

Reported-by: Rufus & Azrael <rufus-azrael@numericable.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Greg KH 2008-08-26 08:20:34 -07:00 коммит произвёл Jesse Barnes
Родитель e1f4f59d1a
Коммит b08508c40a
2 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
drivers/pci/search.c
Просмотреть файл

@ -162,7 +162,7 @@ EXPORT_SYMBOL(pci_find_slot);
* time. * time.
*/ */
struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
const struct pci_dev *from) struct pci_dev *from)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
@ -263,7 +263,7 @@ static int match_pci_dev_by_id(struct device *dev, void *data)
* this file. * this file.
*/ */
static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id, static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
const struct pci_dev *from) struct pci_dev *from)
{ {
struct device *dev; struct device *dev;
struct device *dev_start = NULL; struct device *dev_start = NULL;
@ -303,7 +303,7 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
*/ */
struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
unsigned int ss_vendor, unsigned int ss_device, unsigned int ss_vendor, unsigned int ss_device,
const struct pci_dev *from) struct pci_dev *from)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
struct pci_device_id *id; struct pci_device_id *id;

8
include/linux/pci.h
Просмотреть файл

@ -534,7 +534,7 @@ extern void pci_sort_breadthfirst(void);
#ifdef CONFIG_PCI_LEGACY #ifdef CONFIG_PCI_LEGACY
struct pci_dev __deprecated *pci_find_device(unsigned int vendor, struct pci_dev __deprecated *pci_find_device(unsigned int vendor,
unsigned int device, unsigned int device,
const struct pci_dev *from); struct pci_dev *from);
struct pci_dev __deprecated *pci_find_slot(unsigned int bus, struct pci_dev __deprecated *pci_find_slot(unsigned int bus,
unsigned int devfn); unsigned int devfn);
#endif /* CONFIG_PCI_LEGACY */ #endif /* CONFIG_PCI_LEGACY */
@ -550,7 +550,7 @@ struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
struct pci_dev *from); struct pci_dev *from);
struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
unsigned int ss_vendor, unsigned int ss_device, unsigned int ss_vendor, unsigned int ss_device,
const struct pci_dev *from); struct pci_dev *from);
struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn); struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn);
struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn); struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn);
struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from); struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from);
@ -816,7 +816,7 @@ _PCI_NOP_ALL(write,)
static inline struct pci_dev *pci_find_device(unsigned int vendor, static inline struct pci_dev *pci_find_device(unsigned int vendor,
unsigned int device, unsigned int device,
const struct pci_dev *from) struct pci_dev *from)
{ {
return NULL; return NULL;
} }
@ -838,7 +838,7 @@ static inline struct pci_dev *pci_get_subsys(unsigned int vendor,
unsigned int device, unsigned int device,
unsigned int ss_vendor, unsigned int ss_vendor,
unsigned int ss_device, unsigned int ss_device,
const struct pci_dev *from) struct pci_dev *from)
{ {
return NULL; return NULL;
} }