Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4161
b: refs/heads/master
c: b5bf5b6
h: refs/heads/master
i:
  4159: 9eb8632
v: v3
  • Loading branch information
Jeff Mahoney authored and Linus Torvalds committed Jul 6, 2005
1 parent 890013a commit a539321
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e6557722e69840506eb8bc5a1edcdb4e447a917
refs/heads/master: b5bf5b6786ccfc9e0c8801291f463d92c8e0b423
2 changes: 1 addition & 1 deletion trunk/drivers/macintosh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Each configuration option enables a list of files.

obj-$(CONFIG_PPC_PMAC) += macio_asic.o
obj-$(CONFIG_PPC_PMAC) += macio_asic.o macio_sysfs.o

obj-$(CONFIG_PMAC_MEDIABAY) += mediabay.o
obj-$(CONFIG_MAC_EMUMOUSEBTN) += mac_hid.o
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/macintosh/macio_asic.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,14 @@ static int macio_device_resume(struct device * dev)
return 0;
}

extern struct device_attribute macio_dev_attrs[];

struct bus_type macio_bus_type = {
.name = "macio",
.match = macio_bus_match,
.suspend = macio_device_suspend,
.resume = macio_device_resume,
.dev_attrs = macio_dev_attrs,
};

static int __init macio_bus_driver_init(void)
Expand Down
50 changes: 50 additions & 0 deletions trunk/drivers/macintosh/macio_sysfs.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/stat.h>
#include <asm/macio.h>


#define macio_config_of_attr(field, format_string) \
static ssize_t \
field##_show (struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
struct macio_dev *mdev = to_macio_device (dev); \
return sprintf (buf, format_string, mdev->ofdev.node->field); \
}

static ssize_t
compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
{
struct of_device *of;
char *compat;
int cplen;
int length = 0;

of = &to_macio_device (dev)->ofdev;
compat = (char *) get_property(of->node, "compatible", &cplen);
if (!compat) {
*buf = '\0';
return 0;
}
while (cplen > 0) {
int l;
length += sprintf (buf, "%s\n", compat);
buf += length;
l = strlen (compat) + 1;
compat += l;
cplen -= l;
}

return length;
}

macio_config_of_attr (name, "%s\n");
macio_config_of_attr (type, "%s\n");

struct device_attribute macio_dev_attrs[] = {
__ATTR_RO(name),
__ATTR_RO(type),
__ATTR_RO(compatible),
__ATTR_NULL
};

0 comments on commit a539321

Please sign in to comment.