#ifdef CONFIG_SYSFS
-static struct ipack_device *tpci200_slot_register(const char *board_name,
- int size,
- unsigned int tpci200_number,
+static struct ipack_device *tpci200_slot_register(unsigned int tpci200_number,
unsigned int slot_position)
{
int found = 0;
if (dev != NULL)
return -EBUSY;
- dev = tpci200_slot_register(buf, count, card->number, slot);
+ dev = tpci200_slot_register(card->number, slot);
if (dev == NULL)
return -ENODEV;
struct ipack_device *dev = card->slots[slot].dev;
if (dev != NULL)
- return snprintf(buf, PAGE_SIZE, "%s\n", dev->board_name);
+ return snprintf(buf, PAGE_SIZE, "%s\n", dev_name(&dev->dev));
else
return snprintf(buf, PAGE_SIZE, "none\n");
}
slot_irq->vector = vector;
slot_irq->handler = handler;
slot_irq->arg = arg;
- if (dev->board_name) {
- if (strlen(dev->board_name) > IPACK_IRQ_NAME_SIZE) {
- pr_warning("Slot [%s %d:%d] IRQ name too long (%d char > %d char MAX). Will be truncated!\n",
- TPCI200_SHORTNAME, dev->bus_nr, dev->slot,
- (int)strlen(dev->board_name),
- IPACK_IRQ_NAME_SIZE);
- }
- strncpy(slot_irq->name, dev->board_name, IPACK_IRQ_NAME_SIZE-1);
- } else {
- strcpy(slot_irq->name, "Unknown");
- }
+ slot_irq->name = dev_name(&dev->dev);
tpci200->slots[dev->slot].irq = slot_irq;
res = __tpci200_request_irq(tpci200, dev);
#include <linux/device.h>
-#define IPACK_BOARD_NAME_SIZE 16
-#define IPACK_IRQ_NAME_SIZE 50
#define IPACK_IDPROM_OFFSET_I 0x01
#define IPACK_IDPROM_OFFSET_P 0x03
#define IPACK_IDPROM_OFFSET_A 0x05
* by the carrier board throught bus->ops.
*/
struct ipack_device {
- char board_name[IPACK_BOARD_NAME_SIZE];
- char bus_name[IPACK_BOARD_NAME_SIZE];
unsigned int bus_nr;
unsigned int slot;
unsigned int irq;