Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "mii: miiphy register address width change"

Browse source 
This reverts commit 5c45a22b92.

It causes a lot of "incompatible pointer type" warnings for a large
number of Ethernet drivers, which are not really worth fixing
especially as this patch was only supposed to help the old,
deprecated miiphy API.  Instead of adding more efforts to a lost case
we rather revert it.

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-12-07 08:35:14 +01:00
parent ea45cb0adc
commit f915c9316c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/miiphyutil.c
View file

@ -106,9 +106,9 @@ static int legacy_miiphy_write(struct mii_dev *bus, int addr, int devad,
*/
void miiphy_register(const char *name,
int (*read)(const char *devname, unsigned char addr,
unsigned short reg, unsigned short *value),
unsigned char reg, unsigned short *value),
int (*write)(const char *devname, unsigned char addr,
unsigned short reg, unsigned short value))
unsigned char reg, unsigned short value))
{
struct mii_dev *new_dev;
struct legacy_mii_dev *ldev;
@ -287,7 +287,7 @@ static struct mii_dev *miiphy_get_active_dev(const char *devname)
* Returns:
* 0 on success
*/
int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
unsigned short *value)
{
struct mii_dev *bus;
@ -315,7 +315,7 @@ int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
* Returns:
* 0 on success
*/
int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
unsigned short value)
{
struct mii_dev *bus;

12
include/miiphy.h
View file

@ -42,14 +42,14 @@
struct legacy_mii_dev {
int (*read)(const char *devname, unsigned char addr,
unsigned short reg, unsigned short *value);
unsigned char reg, unsigned short *value);
int (*write)(const char *devname, unsigned char addr,
unsigned short reg, unsigned short value);
unsigned char reg, unsigned short value);
};
int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
unsigned short *value);
int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
unsigned short value);
int miiphy_info(const char *devname, unsigned char addr, unsigned int *oui,
unsigned char *model, unsigned char *rev);
@ -65,9 +65,9 @@ void miiphy_init(void);
void miiphy_register(const char *devname,
int (*read)(const char *devname, unsigned char addr,
unsigned short reg, unsigned short *value),
unsigned char reg, unsigned short *value),
int (*write)(const char *devname, unsigned char addr,
unsigned short reg, unsigned short value));
unsigned char reg, unsigned short value));
int miiphy_set_current_dev(const char *devname);
const char *miiphy_get_current_dev(void);