*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
-#include <linux/proc_fs.h>
-#include <linux/workqueue.h>
#include <linux/pci.h>
#include "shpchp.h"
res = bus->resource[index];
if (res && (res->flags & IORESOURCE_MEM) &&
!(res->flags & IORESOURCE_PREFETCH)) {
- out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",
- res->start, (res->end - res->start));
+ out += sprintf(out, "start = %8.8llx, "
+ "length = %8.8llx\n",
+ (unsigned long long)res->start,
+ (unsigned long long)(res->end - res->start));
}
}
out += sprintf(out, "Free resources: prefetchable memory\n");
res = bus->resource[index];
if (res && (res->flags & IORESOURCE_MEM) &&
(res->flags & IORESOURCE_PREFETCH)) {
- out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",
- res->start, (res->end - res->start));
+ out += sprintf(out, "start = %8.8llx, "
+ "length = %8.8llx\n",
+ (unsigned long long)res->start,
+ (unsigned long long)(res->end - res->start));
}
}
out += sprintf(out, "Free resources: IO\n");
for (index = 0; index < PCI_BUS_NUM_RESOURCES; index++) {
res = bus->resource[index];
if (res && (res->flags & IORESOURCE_IO)) {
- out += sprintf(out, "start = %8.8lx, length = %8.8lx\n",
- res->start, (res->end - res->start));
+ out += sprintf(out, "start = %8.8llx, "
+ "length = %8.8llx\n",
+ (unsigned long long)res->start,
+ (unsigned long long)(res->end - res->start));
}
}
out += sprintf(out, "Free resources: bus numbers\n");
}
static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
-static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf)
+int __must_check shpchp_create_ctrl_files (struct controller *ctrl)
{
- struct pci_dev *pdev, *fdev;
- struct controller *ctrl;
- char * out = buf;
- int index;
- struct resource *res;
- struct pci_func *new_slot;
- struct slot *slot;
-
- pdev = container_of (dev, struct pci_dev, dev);
- ctrl = pci_get_drvdata(pdev);
-
- slot=ctrl->slot;
-
- while (slot) {
- new_slot = shpchp_slot_find(slot->bus, slot->device, 0);
- if (!new_slot)
- break;
- fdev = new_slot->pci_dev;
- if (!fdev)
- break;
- out += sprintf(out, "assigned resources: memory\n");
- for (index=0; index <= PCI_NUM_RESOURCES; index++) {
- res = &(fdev->resource[index]);
- if (res && (res->flags & IORESOURCE_MEM) &&
- !(res->flags & IORESOURCE_PREFETCH)) {
- out += sprintf(out,
- "start = %8.8lx, length = %8.8lx\n",
- res->start, (res->end - res->start));
- }
- }
- out += sprintf(out, "assigned resources: prefetchable memory\n");
- for (index=0; index <= PCI_NUM_RESOURCES; index++) {
- res = &(fdev->resource[index]);
- if (res && (res->flags & (IORESOURCE_MEM |
- IORESOURCE_PREFETCH))) {
- out += sprintf(out,
- "start = %8.8lx, length = %8.8lx\n",
- res->start, (res->end - res->start));
- }
- }
- out += sprintf(out, "assigned resources: IO\n");
- for (index=0; index <= PCI_NUM_RESOURCES; index++) {
- res = &(fdev->resource[index]);
- if (res && (res->flags & IORESOURCE_IO)) {
- out += sprintf(out,
- "start = %8.8lx, length = %8.8lx\n",
- res->start, (res->end - res->start));
- }
- }
- out += sprintf(out, "assigned resources: bus numbers\n");
- if (fdev->subordinate)
- out += sprintf(out, "start = %8.8x, length = %8.8x\n",
- fdev->subordinate->secondary,
- (fdev->subordinate->subordinate -
- fdev->subordinate->secondary));
- else
- out += sprintf(out, "start = %8.8x, length = %8.8x\n",
- fdev->bus->number, 1);
- slot=slot->next;
- }
-
- return out - buf;
+ return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
}
-static DEVICE_ATTR (dev, S_IRUGO, show_dev, NULL);
-void shpchp_create_ctrl_files (struct controller *ctrl)
+void shpchp_remove_ctrl_files(struct controller *ctrl)
{
- device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
- device_create_file (&ctrl->pci_dev->dev, &dev_attr_dev);
+ device_remove_file(&ctrl->pci_dev->dev, &dev_attr_ctrl);
}