[PATCH] drmOpenByName: remove redundant drmAvailable check

[Thierry Reding]

On Tue, May 13, 2014 at 11:46:54AM +0800, Daniel Kurtz wrote:
> Rob,
> Can you take a look at this one too, now that I have your attention :-).

Oh, and now I read that you wanted Rob to look at this. Rob, I hope you
don't mind me jumping the queue.

Thierry
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: 

[PATCH] drmOpenByName: remove redundant drmAvailable check

[Thierry Reding]

On Thu, Apr 17, 2014 at 12:08:01PM +0800, Daniel Kurtz wrote:
> drmOpenByName() is a static function that is only called by drmOpen().
> drmOpen() already checks drmAvailable(), so the checki in
> drmOpenByName() is redundant.
> 
> Signed-off-by: Daniel Kurtz 
> ---
>  xf86drm.c | 13 -
>  1 file changed, 13 deletions(-)

Looks good to me. I've fixed up the typo (checki -> check) in the commit
message and pushed this.

Thierry
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: 

[PATCH] drmOpenByName: remove redundant drmAvailable check

[Daniel Kurtz]

Rob,
Can you take a look at this one too, now that I have your attention :-).
-djk

On Thu, Apr 17, 2014 at 12:08 PM, Daniel Kurtz  wrote:
> drmOpenByName() is a static function that is only called by drmOpen().
> drmOpen() already checks drmAvailable(), so the checki in
> drmOpenByName() is redundant.
>
> Signed-off-by: Daniel Kurtz 
> ---
>  xf86drm.c | 13 -
>  1 file changed, 13 deletions(-)
>
> diff --git a/xf86drm.c b/xf86drm.c
> index 720952f..118022c 100644
> --- a/xf86drm.c
> +++ b/xf86drm.c
> @@ -537,19 +537,6 @@ static int drmOpenByName(const char *name)
>  int   fd;
>  drmVersionPtr version;
>  char *id;
> -
> -if (!drmAvailable()) {
> -   if (!drm_server_info) {
> -   return -1;
> -   }
> -   else {
> -   /* try to load the kernel module now */
> -   if (!drm_server_info->load_module(name)) {
> -   drmMsg("[drm] failed to load kernel module \"%s\"\n", name);
> -   return -1;
> -   }
> -   }
> -}
>
>  /*
>   * Open the first minor number that matches the driver name and isn't
> --
> 1.9.1.423.g4596e3a
>

[PATCH] drmOpenByName: remove redundant drmAvailable check

[Rob Clark]

On Tue, May 13, 2014 at 7:49 AM, Thierry Reding
 wrote:
> On Tue, May 13, 2014 at 11:46:54AM +0800, Daniel Kurtz wrote:
>> Rob,
>> Can you take a look at this one too, now that I have your attention :-).
>
> Oh, and now I read that you wanted Rob to look at this. Rob, I hope you
> don't mind me jumping the queue.

thx Thierry, I'm not going to argue about someone doing my work for me
before I have a chance to :-P

[PATCH] drmOpenByName: remove redundant drmAvailable check

[Daniel Kurtz]

drmOpenByName() is a static function that is only called by drmOpen().
drmOpen() already checks drmAvailable(), so the checki in
drmOpenByName() is redundant.

Signed-off-by: Daniel Kurtz 
---
 xf86drm.c | 13 -
 1 file changed, 13 deletions(-)

diff --git a/xf86drm.c b/xf86drm.c
index 720952f..118022c 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -537,19 +537,6 @@ static int drmOpenByName(const char *name)
 int   fd;
 drmVersionPtr version;
 char *id;
-
-if (!drmAvailable()) {
-   if (!drm_server_info) {
-   return -1;
-   }
-   else {
-   /* try to load the kernel module now */
-   if (!drm_server_info->load_module(name)) {
-   drmMsg("[drm] failed to load kernel module \"%s\"\n", name);
-   return -1;
-   }
-   }
-}

 /*
  * Open the first minor number that matches the driver name and isn't
-- 
1.9.1.423.g4596e3a