fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 02:20:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfree86: Fix -Wdiscarded-qualifiers warnings in SPARC Sbus probe code

Browse source 
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2070>
This commit is contained in:
Alan Coopersmith 2025-09-25 17:47:50 -07:00
parent a8f8ec7e7d
commit 5210495f7d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/common/xf86AutoConfig.c
View file

@ -286,7 +286,7 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
}
#endif
#ifdef __sparc__
char *sbusDriver = sparcDriverName();
const char *sbusDriver = sparcDriverName();
if (sbusDriver)
xf86AddMatchedDriver(md, sbusDriver);

2
hw/xfree86/common/xf86sbusBus.h
View file

@ -102,7 +102,7 @@ extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);
extern _X_EXPORT void sparcPromAssignNodes(void);
extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
extern _X_EXPORT char *sparcDriverName(void);
extern _X_EXPORT const char *sparcDriverName(void);
extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,

10
hw/xfree86/os-support/bus/Sbus.c
View file

@ -245,7 +245,7 @@ sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
return promGetBool(prop);
}
static char *
static const char *
promWalkGetDriverName(int node, int oldnode)
{
int nextnode;
@ -275,7 +275,7 @@ promWalkGetDriverName(int node, int oldnode)
nextnode = promGetChild(node);
if (nextnode) {
char *name;
const char *name;
name = promWalkGetDriverName(nextnode, node);
if (name)
@ -288,10 +288,10 @@ promWalkGetDriverName(int node, int oldnode)
return NULL;
}
char *
const char *
sparcDriverName(void)
{
char *name;
const char *name;
if (sparcPromInit() < 0)
return NULL;
@ -401,7 +401,7 @@ sparcPromAssignNodes(void)
int fbNum, devId;
static struct {
int devId;
char *prefix;
const char *prefix;
} procFbPrefixes[] = {
{SBUS_DEVICE_BW2, "BWtwo"},
{SBUS_DEVICE_CG14, "CGfourteen"},