projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[linux-drm-fsl-dcu.git]
/
arch
/
powerpc
/
sysdev
/
tsi108_dev.c
diff --git
a/arch/powerpc/sysdev/tsi108_dev.c
b/arch/powerpc/sysdev/tsi108_dev.c
index f3038461d4c0566f162ecacba1ccff41ebd5515b..337039ee51e623acf3c8c940639886757e76ca12 100644
(file)
--- a/
arch/powerpc/sysdev/tsi108_dev.c
+++ b/
arch/powerpc/sysdev/tsi108_dev.c
@@
-9,7
+9,6
@@
* option) any later version.
*/
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-49,7
+48,7
@@
phys_addr_t get_csrbase(void)
tsi = of_find_node_by_type(NULL, "tsi-bridge");
if (tsi) {
unsigned int size;
tsi = of_find_node_by_type(NULL, "tsi-bridge");
if (tsi) {
unsigned int size;
-
void *prop =
get_property(tsi, "reg", &size);
+
const void *prop = of_
get_property(tsi, "reg", &size);
tsi108_csr_base = of_translate_address(tsi, prop);
of_node_put(tsi);
};
tsi108_csr_base = of_translate_address(tsi, prop);
of_node_put(tsi);
};
@@
-78,10
+77,10
@@
static int __init tsi108_eth_of_init(void)
struct resource r[2];
struct device_node *phy;
hw_info tsi_eth_data;
struct resource r[2];
struct device_node *phy;
hw_info tsi_eth_data;
- unsigned int *id;
- unsigned int *phy_id;
- void *mac_addr;
- phandle *ph;
+
const
unsigned int *id;
+
const
unsigned int *phy_id;
+
const
void *mac_addr;
+
const
phandle *ph;
memset(r, 0, sizeof(r));
memset(&tsi_eth_data, 0, sizeof(tsi_eth_data));
memset(r, 0, sizeof(r));
memset(&tsi_eth_data, 0, sizeof(tsi_eth_data));
@@
-108,10
+107,10
@@
static int __init tsi108_eth_of_init(void)
goto err;
}
goto err;
}
- mac_addr = get_property(np, "address", NULL);
+ mac_addr =
of_
get_property(np, "address", NULL);
memcpy(tsi_eth_data.mac_addr, mac_addr, 6);
memcpy(tsi_eth_data.mac_addr, mac_addr, 6);
- ph =
(phandle *)
get_property(np, "phy-handle", NULL);
+ ph =
of_
get_property(np, "phy-handle", NULL);
phy = of_find_node_by_phandle(*ph);
if (phy == NULL) {
phy = of_find_node_by_phandle(*ph);
if (phy == NULL) {
@@
-119,8
+118,8
@@
static int __init tsi108_eth_of_init(void)
goto unreg;
}
goto unreg;
}
- id =
(u32 *)
get_property(phy, "reg", NULL);
- phy_id =
(u32 *)
get_property(phy, "phy-id", NULL);
+ id =
of_
get_property(phy, "reg", NULL);
+ phy_id =
of_
get_property(phy, "phy-id", NULL);
ret = of_address_to_resource(phy, 0, &res);
if (ret) {
of_node_put(phy);
ret = of_address_to_resource(phy, 0, &res);
if (ret) {
of_node_put(phy);