From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?windows-1252?Q?Michel_D=E4nzer?= <michel@daenzer.net>
Subject: Re: Remove radeon DRM Kconfig forced options
Date: Mon, 25 Aug 2014 11:26:31 +0900
Message-ID: <53FA9ED7.40100@daenzer.net>
References: <1408828294.88920.YahooMailNeo@web142603.mail.bf1.yahoo.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: quoted-printable
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from mail.gna.ch (darkcity.gna.ch [195.226.6.51])
 by gabe.freedesktop.org (Postfix) with ESMTP id B7ADA6E112
 for <dri-devel@lists.freedesktop.org>; Sun, 24 Aug 2014 19:26:36 -0700 (PDT)
In-Reply-To: <1408828294.88920.YahooMailNeo@web142603.mail.bf1.yahoo.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Alec Ari <neotheuser@ymail.com>
Cc: "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

On 24.08.2014 06:11, Alec Ari wrote:
> Based against 3.17-rc1
> =

> Makes POWER_SUPPLY HWMON and BACKLIGHT_CLASS_DEVICE optional

Please send a patch generated by git format-patch, preferably sent by
git sen-email.


> @@ -653,9 +655,11 @@ static int radeon_hwmon_init(struct radeon_device *r=
dev)
>  	case THERMAL_TYPE_KV:
>  		if (rdev->asic->pm.get_temperature =3D=3D NULL)
>  			return err;
> +		#ifdef CONFIG_HWMON
>  		rdev->pm.int_hwmon_dev =3D hwmon_device_register_with_groups(rdev->dev,
>  									   "radeon", rdev,
>  									   hwmon_groups);
> +		#endif
>  		if (IS_ERR(rdev->pm.int_hwmon_dev)) {
>  			err =3D PTR_ERR(rdev->pm.int_hwmon_dev);
>  			dev_err(rdev->dev,

#ifdef and #endif need to be at the start of the line.


> @@ -669,11 +673,13 @@ static int radeon_hwmon_init(struct radeon_device *=
rdev)
>  	return err;
>  }
>  =

> +#ifdef CONFIG_HWMON
>  static void radeon_hwmon_fini(struct radeon_device *rdev)
>  {
>  	if (rdev->pm.int_hwmon_dev)
>  		hwmon_device_unregister(rdev->pm.int_hwmon_dev);
>  }
> +#endif
>  =

>  static void radeon_dpm_thermal_work_handler(struct work_struct *work)
>  {
> @@ -1398,8 +1404,9 @@ static void radeon_pm_fini_old(struct radeon_device=
 *rdev)
>  		device_remove_file(rdev->dev, &dev_attr_power_profile);
>  		device_remove_file(rdev->dev, &dev_attr_power_method);
>  	}
> -
> +	#ifdef CONFIG_HWMON
>  	radeon_hwmon_fini(rdev);
> +	#endif
>  	kfree(rdev->pm.power_state);
>  }
>  =

> @@ -1417,8 +1424,9 @@ static void radeon_pm_fini_dpm(struct radeon_device=
 *rdev)
>  		device_remove_file(rdev->dev, &dev_attr_power_method);
>  	}
>  	radeon_dpm_fini(rdev);
> -
> +	#ifdef CONFIG_HWMON
>  	radeon_hwmon_fini(rdev);
> +	#endif
>  	kfree(rdev->pm.power_state);
>  }
>  =


Might be better to move the guard inside radeon_hwmon_fini() than to
guard it at every call site.


-- =

Earthling Michel D=E4nzer            |                  http://www.amd.com
Libre software enthusiast          |                Mesa and X developer