projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md: Notify sysfs when RAID1/5/10 disk is In_sync.
[cascardo/linux.git]
/
drivers
/
net
/
sunhme.c
diff --git
a/drivers/net/sunhme.c
b/drivers/net/sunhme.c
index
eec443f
..
bd0df1c
100644
(file)
--- a/
drivers/net/sunhme.c
+++ b/
drivers/net/sunhme.c
@@
-1591,7
+1591,7
@@
static int happy_meal_init(struct happy_meal *hp)
*/
#ifdef CONFIG_SBUS
if ((hp->happy_flags & HFLAG_PCI) == 0) {
*/
#ifdef CONFIG_SBUS
if ((hp->happy_flags & HFLAG_PCI) == 0) {
- struct
of
_device *op = hp->happy_dev;
+ struct
platform
_device *op = hp->happy_dev;
if (sbus_can_dma_64bit()) {
sbus_set_sbus64(&op->dev,
hp->happy_bursts);
if (sbus_can_dma_64bit()) {
sbus_set_sbus64(&op->dev,
hp->happy_bursts);
@@
-2480,7
+2480,7
@@
static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
#ifdef CONFIG_SBUS
else {
const struct linux_prom_registers *regs;
#ifdef CONFIG_SBUS
else {
const struct linux_prom_registers *regs;
- struct
of
_device *op = hp->happy_dev;
+ struct
platform
_device *op = hp->happy_dev;
regs = of_get_property(op->dev.of_node, "regs", NULL);
if (regs)
sprintf(info->bus_info, "SBUS:%d",
regs = of_get_property(op->dev.of_node, "regs", NULL);
if (regs)
sprintf(info->bus_info, "SBUS:%d",
@@
-2515,13
+2515,13
@@
static int hme_version_printed;
*
* Return NULL on failure.
*/
*
* Return NULL on failure.
*/
-static struct quattro * __devinit quattro_sbus_find(struct
of
_device *child)
+static struct quattro * __devinit quattro_sbus_find(struct
platform
_device *child)
{
struct device *parent = child->dev.parent;
{
struct device *parent = child->dev.parent;
- struct
of
_device *op;
+ struct
platform
_device *op;
struct quattro *qp;
struct quattro *qp;
- op = to_
of
_device(parent);
+ op = to_
platform
_device(parent);
qp = dev_get_drvdata(&op->dev);
if (qp)
return qp;
qp = dev_get_drvdata(&op->dev);
if (qp)
return qp;
@@
-2551,7
+2551,7
@@
static int __init quattro_sbus_register_irqs(void)
struct quattro *qp;
for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
struct quattro *qp;
for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
- struct
of
_device *op = qp->quattro_dev;
+ struct
platform
_device *op = qp->quattro_dev;
int err, qfe_slot, skip = 0;
for (qfe_slot = 0; qfe_slot < 4; qfe_slot++) {
int err, qfe_slot, skip = 0;
for (qfe_slot = 0; qfe_slot < 4; qfe_slot++) {
@@
-2580,7
+2580,7
@@
static void quattro_sbus_free_irqs(void)
struct quattro *qp;
for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
struct quattro *qp;
for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
- struct
of
_device *op = qp->quattro_dev;
+ struct
platform
_device *op = qp->quattro_dev;
int qfe_slot, skip = 0;
for (qfe_slot = 0; qfe_slot < 4; qfe_slot++) {
int qfe_slot, skip = 0;
for (qfe_slot = 0; qfe_slot < 4; qfe_slot++) {
@@
-2639,7
+2639,7
@@
static const struct net_device_ops hme_netdev_ops = {
};
#ifdef CONFIG_SBUS
};
#ifdef CONFIG_SBUS
-static int __devinit happy_meal_sbus_probe_one(struct
of
_device *op, int is_qfe)
+static int __devinit happy_meal_sbus_probe_one(struct
platform
_device *op, int is_qfe)
{
struct device_node *dp = op->dev.of_node, *sbus_dp;
struct quattro *qp = NULL;
{
struct device_node *dp = op->dev.of_node, *sbus_dp;
struct quattro *qp = NULL;
@@
-2648,7
+2648,7
@@
static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
int i, qfe_slot = -1;
int err = -ENODEV;
int i, qfe_slot = -1;
int err = -ENODEV;
- sbus_dp =
to_of_device(op->dev.parent)->dev.
of_node;
+ sbus_dp =
op->dev.parent->
of_node;
/* We can match PCI devices too, do not accept those here. */
if (strcmp(sbus_dp->name, "sbus"))
/* We can match PCI devices too, do not accept those here. */
if (strcmp(sbus_dp->name, "sbus"))
@@
-3235,7
+3235,7
@@
static void happy_meal_pci_exit(void)
#endif
#ifdef CONFIG_SBUS
#endif
#ifdef CONFIG_SBUS
-static int __devinit hme_sbus_probe(struct
of
_device *op, const struct of_device_id *match)
+static int __devinit hme_sbus_probe(struct
platform
_device *op, const struct of_device_id *match)
{
struct device_node *dp = op->dev.of_node;
const char *model = of_get_property(dp, "model", NULL);
{
struct device_node *dp = op->dev.of_node;
const char *model = of_get_property(dp, "model", NULL);
@@
-3247,7
+3247,7
@@
static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device
return happy_meal_sbus_probe_one(op, is_qfe);
}
return happy_meal_sbus_probe_one(op, is_qfe);
}
-static int __devexit hme_sbus_remove(struct
of
_device *op)
+static int __devexit hme_sbus_remove(struct
platform
_device *op)
{
struct happy_meal *hp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = hp->dev;
{
struct happy_meal *hp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = hp->dev;