mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
xfree86: Fix -Wdiscarded-qualifiers warnings in SPARC Sbus probe code
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:
committed by
Enrico Weigelt
parent
c179700b99
commit
855aa4ef86
@@ -288,7 +288,7 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
|
||||
}
|
||||
#endif
|
||||
#ifdef __sparc__
|
||||
char *sbusDriver = sparcDriverName();
|
||||
const char *sbusDriver = sparcDriverName();
|
||||
|
||||
if (sbusDriver)
|
||||
xf86AddMatchedDriver(md, sbusDriver);
|
||||
|
||||
@@ -29,6 +29,6 @@ char *sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp);
|
||||
void sparcPromAssignNodes(void);
|
||||
char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
|
||||
int sparcPromPathname2Node(const char *pathName);
|
||||
char *sparcDriverName(void);
|
||||
const char *sparcDriverName(void);
|
||||
|
||||
#endif /* _XSERVER_XF86_SBUSBUS_H */
|
||||
|
||||
@@ -237,7 +237,7 @@ sparcPromGetBool(sbusPromNodePtr pnode, const char *prop)
|
||||
return promGetBool(prop);
|
||||
}
|
||||
|
||||
static char *
|
||||
static const char *
|
||||
promWalkGetDriverName(int node, int oldnode)
|
||||
{
|
||||
int nextnode;
|
||||
@@ -267,7 +267,7 @@ promWalkGetDriverName(int node, int oldnode)
|
||||
|
||||
nextnode = promGetChild(node);
|
||||
if (nextnode) {
|
||||
char *name;
|
||||
const char *name;
|
||||
|
||||
name = promWalkGetDriverName(nextnode, node);
|
||||
if (name)
|
||||
@@ -280,10 +280,10 @@ promWalkGetDriverName(int node, int oldnode)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *
|
||||
const char *
|
||||
sparcDriverName(void)
|
||||
{
|
||||
char *name;
|
||||
const char *name;
|
||||
|
||||
if (sparcPromInit() < 0)
|
||||
return NULL;
|
||||
@@ -393,7 +393,7 @@ sparcPromAssignNodes(void)
|
||||
int fbNum, devId;
|
||||
static struct {
|
||||
int devId;
|
||||
char *prefix;
|
||||
const char *prefix;
|
||||
} procFbPrefixes[] = {
|
||||
{SBUS_DEVICE_CG14, "CGfourteen"},
|
||||
{SBUS_DEVICE_CG6, "CGsix"},
|
||||
|
||||
Reference in New Issue
Block a user